diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2368345..cab768d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,6 +33,8 @@
     <uses-permission android:name="android.permission.RESTART_PACKAGES"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
     <uses-permission android:name="android.permission.BATTERY_STATS"/>
+    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
 
     <application android:label="@string/settings_label" android:icon="@drawable/ic_launcher_settings">
 
@@ -87,6 +89,8 @@
         </activity>
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
+                  android:configChanges="orientation|keyboardHidden"
+                  android:launchMode="singleInstance" 
                 >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -205,7 +209,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ManageApplications" android:label="@string/manageapplications_settings_title">
+        <activity android:name="ManageApplications"
+                  android:label="@string/manageapplications_settings_title"
+                  android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
@@ -476,14 +482,19 @@
        </receiver>
 
         <!-- Standard picker for gadgets -->
-
-        <activity android:name="GadgetPickActivity" android:label="@string/gadget_picker_title">
+        <activity android:name="GadgetPickActivity" android:label="@string/widget_picker_title">
             <intent-filter>
                 <action android:name="android.gadget.action.GADGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
+        <!-- Helper to bind any unbound gadgets in Launcher, used as
+             part of initialization and upgrade process -->
+        <activity android:name="LauncherGadgetBinder"
+                android:permission="com.android.launcher.permission.WRITE_SETTINGS"
+                android:theme="@android:style/Theme.NoDisplay" android:exported="true" />
+
         <activity android:name="UsageStats" android:label="@string/usage_stats_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 1006481..a62f049 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Nikdy, je-li zapnuto napájení"</item>
     <item>"Nikdy"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Využití CPU"</item>
-    <item>"Používání sítě"</item>
-    <item>"Využití senzoru"</item>
-    <item>"Doba zapnutí obrazovky"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Od resetování zařízení"</item>
-    <item>"Před posledním spuštěním"</item>
-    <item>"Od posledního spuštění"</item>
-    <item>"Od posledního odpojení"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Doba použití"</item>
     <item>"Počet spuštění"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9a89ac6..5aca72a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"Odpojeno"</string>
     <string name="bluetooth_disconnecting">"Odpojování..."</string>
     <string name="bluetooth_connecting">"Připojování..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Párovat s tímto zařízením"</string>
     <string name="bluetooth_pairing">"Párování..."</string>
-    <string name="bluetooth_paired">"Párováno. Odpojeno."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"Náhlavní souprava či handsfree"</string>
     <string name="progress_scanning">"Vyhledávání"</string>
     <string name="bluetooth_notif_ticker">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title">"Požadavek na párování"</string>
-    <string name="bluetooth_notif_message">"Povolit párování se zařízením"</string>
+    <string name="bluetooth_notif_message">"Povolit párování se zařízením "</string>
     <string name="date_and_time">"Nastavení data a času"</string>
     <string name="date_time_12_hour_sample">"13:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Volba časového pásma"</string>
     <string name="display_preview_label">"Náhled:"</string>
     <string name="display_font_size_label">"Velikost písma:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Odeslat <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -321,7 +322,7 @@
     <string name="fragment_status_connecting">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_authenticating">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_obtaining_ip">"Získávání adresy IP ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
-    <string name="fragment_status_connected">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>."</string>
+    <string name="fragment_status_connected">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="fragment_status_disconnecting">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_disconnected">"Odpojeno"</string>
     <string name="fragment_status_failed">"Připojení se nezdařilo."</string>
@@ -429,14 +430,14 @@
     <string name="sd_format">"Formátovat kartu SD"</string>
     <string name="sd_format_summary">"Formátovat (vymazat) kartu SD"</string>
     <string name="sd_unavailable">"Nedostupný údaj"</string>
-    <string name="read_only">"(Pouze pro čtení)"</string>
+    <string name="read_only">" (Pouze pro čtení)"</string>
     <string name="battery_status_title">"Stav baterie"</string>
     <string name="battery_level_title">"Stav baterie"</string>
-    <string name="apn_settings">"Názvy AP"</string>
+    <string name="apn_settings">"Přístupové body"</string>
     <string name="apn_edit">"Upravit přístupový bod"</string>
     <string name="apn_not_set">"&lt;Nenastaveno&gt;"</string>
     <string name="apn_name">"Jméno"</string>
-    <string name="apn_apn">"Název AP"</string>
+    <string name="apn_apn">"Název přístupvého bodu (APN)"</string>
     <string name="apn_http_proxy">"Proxy"</string>
     <string name="apn_http_port">"Port"</string>
     <string name="apn_user">"Uživatelské jméno"</string>
@@ -447,11 +448,11 @@
     <string name="apn_mms_port">"Port systému MMS"</string>
     <string name="apn_mcc">"MCC"</string>
     <string name="apn_mnc">"MNC"</string>
-    <string name="apn_type">"Typ názvu AP"</string>
-    <string name="menu_delete">"Smazat název přístupového bodu"</string>
-    <string name="menu_new">"Nový název AP"</string>
+    <string name="apn_type">"typ APN"</string>
+    <string name="menu_delete">"Smazat APN"</string>
+    <string name="menu_new">"Nový APN"</string>
     <string name="menu_save">"Uložit"</string>
-    <string name="menu_cancel">"Zahodit"</string>
+    <string name="menu_cancel">"Zrušit"</string>
     <string name="error_title">"Upozornění"</string>
     <string name="error_name_empty">"Pole Název nemůže být prázdné."</string>
     <string name="error_apn_empty">"Název AP nemůže být prázdný."</string>
@@ -463,8 +464,8 @@
     <string name="master_clear_button_text">"Resetovat telefon"</string>
     <string name="master_clear_final_desc">"Opravdu chcete resetovat telefon? Smažete veškerá data a aplikace. Proces nelze zvrátit."</string>
     <string name="master_clear_final_button_text">"Odstranit vše"</string>
-    <string name="master_clear_gesture_prompt">"Proveďte gesto odemknutí"</string>
-    <string name="master_clear_gesture_explanation">"Chcete-li potvrdit reset telefonu, musíte provést gesto odemknutí."</string>
+    <string name="master_clear_gesture_prompt">"Nakreslete své bezpečnostní gesto"</string>
+    <string name="master_clear_gesture_explanation">"Chcete-li potvrdit resetování telefonu, musíte nakreslit bezpečnostní gesto."</string>
     <string name="master_clear_failed">"Pokus o reset se nezdařil, protože služba System Clear není dostupná."</string>
     <string name="media_format_title">"Formátovat kartu SD"</string>
     <string name="media_format_summary">"Vymaže všechna data na kartě SD"</string>
@@ -472,12 +473,12 @@
     <string name="media_format_button_text">"Formátovat kartu SD"</string>
     <string name="media_format_final_desc">"Formátování karty SD. Chcete smazat všechna svoje média? Akci nelze vrátit zpět."</string>
     <string name="media_format_final_button_text">"Smazat vše"</string>
-    <string name="media_format_gesture_prompt">"Nakreslete odemykací obrazec"</string>
-    <string name="media_format_gesture_explanation">"Formátování karty SD je potřeba potvrdit nakreslením odemykacího obrazce."</string>
+    <string name="media_format_gesture_prompt">"Nakreslete své bezpečnostní gesto"</string>
+    <string name="media_format_gesture_explanation">"Formátování karty SD je potřeba potvrdit nakreslením bezpečnostního gesta."</string>
     <string name="call_settings_title">"Nastavení hovorů"</string>
     <string name="call_settings_summary">"Umožňuje nastavit hlasovou schránku, přesměrování hovorů, další hovory na lince a ID volajícího"</string>
     <string name="network_settings_title">"Mobilní sítě"</string>
-    <string name="network_settings_summary">"Umožňuje nastavit možnosti roamingu, sítí a názvy AP"</string>
+    <string name="network_settings_summary">"Umožňuje nastavit možnosti roamingu, sítí a názvy přístupových bodů"</string>
     <string name="location_title">"Zdroje polohy"</string>
     <string name="location_network_based">"Zaměření přes bezdrátové sítě"</string>
     <string name="location_networks_disabled">"Zobrazuje polohu v aplikacích (jako Mapy) pomocí bezdrátových sítí"</string>
@@ -495,37 +496,37 @@
     <string name="settings_license_activity_title">"Licence open source"</string>
     <string name="settings_license_activity_unavailable">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading">"Načítání..."</string>
-    <string name="lock_settings_title">"Gesto odemknutí obrazovky"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Změna gesta odemknutí"</string>
+    <string name="lock_settings_title">"Gesto pro odemknutí obrazovky"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_need_to_unlock">"Potvrďte uložené gesto"</string>
     <string name="lockpattern_need_to_unlock_wrong">"Zkuste to prosím znovu:"</string>
-    <string name="lockpattern_recording_intro_header">"Proveďte gesto odemknutí"</string>
+    <string name="lockpattern_recording_intro_header">"Nakreslete své bezpečnostní gesto."</string>
     <string name="lockpattern_recording_intro_footer">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress">"Na závěr zdvihněte prst z obrazovky."</string>
     <string name="lockpattern_recording_incorrect_too_short">"Minimální počet spojených teček je <xliff:g id="NUMBER">%d</xliff:g>. Zkuste to znovu:"</string>
     <string name="lockpattern_pattern_entered_header">"Gesto bylo zaznamenáno."</string>
-    <string name="lockpattern_need_to_confirm">"Proveďte gesto znovu pro potvrzení:"</string>
-    <string name="lockpattern_pattern_confirmed_header">"Nové gesto odemknutí:"</string>
+    <string name="lockpattern_need_to_confirm">"Pro potvrzení nakreslete gesto znovu:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Nové bezpečnostní gesto:"</string>
     <string name="lockpattern_confirm_button_text">"Potvrdit"</string>
     <string name="lockpattern_restart_button_text">"Nakreslit znovu"</string>
     <string name="lockpattern_retry_button_text">"Zkusit znovu"</string>
     <string name="lockpattern_continue_button_text">"Pokračovat"</string>
-    <string name="lockpattern_settings_title">"Gesto odemknutí"</string>
+    <string name="lockpattern_settings_title">"Bezpečnostní gesto"</string>
     <string name="lockpattern_settings_enable_title">"Požadovat gesto"</string>
-    <string name="lockpattern_settings_enable_summary">"Obrazovku je nutné odemknout gestem ruky"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Použití viditelného vzoru"</string>
+    <string name="lockpattern_settings_enable_summary">"Obrazovku je nutné odemknout pomocí bezpečnostního gesta"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Použití viditelného gesta"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title">"Použití dotykového ověření"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Nastavení gesta odemknutí"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Změna gesta odemknutí"</string>
-    <string name="lockpattern_settings_help_how_to_record">"Gesto odemknutí obrazovky proveďte tímto způsobem"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Nastavení bezpečnostního gesta"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Změna bezpečnostního gesta"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Bezpečnostní gesto nakreslíte takto"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Příliš mnoho neplatných pokusů."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="skip_button_label">"Zrušit"</string>
     <string name="next_button_label">"Další"</string>
     <string name="lock_title">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message"><font size="17">"Chraňte svůj telefon před nepovoleným použitím vytvořením osobního gesta odemknutí. "\n<font height="17">\n</font><b>"1"</b>"  Na dalším snímku uvidíte příklad takového gesta. "\n<font height="17">\n</font><b>"2"</b>"  Až budete připraveni, proveďte své osobní gesto odemknutí. Vyzkoušejte více gest, ale vždy spojte alespoň čtyři tečky. "\n<font height="17">\n</font><b>"3"</b>"  Opakujte gesto pro potvrzení. "\n<font height="17">\n</font><b>"Jste připraveni začít? Zvolte tlačítko Další "</b>". "\n<font height="3">\n</font>"Chcete-li ponechat telefon nezabezpečený, zvolte tlačítko Storno."</font></string>
+    <string name="lock_intro_message"><font size="17">"Chraňte svůj telefon před nepovoleným použitím vytvořením osobního bezpečnostního gesta. "\n<font height="17">\n</font><b>"1"</b>"  Příklad takového gesta uvidíte na dalším snímku. "\n<font height="17">\n</font><b>"2"</b>"  Až budete připraveni, nakreslete své osobní bezpečnostní gesto. Vyzkoušejte více gest, ale vždy spojte alespoň čtyři tečky. "\n<font height="17">\n</font><b>"3"</b>"  Chcete-li gesto potvrdit, zopakujte je. "\n<font height="17">\n</font><b>"Jste připraveni začít? Zvolte tlačítko Další "</b>". "\n<font height="3">\n</font>"Chcete-li ponechat telefon nezabezpečený, zvolte tlačítko Zrušit."</font></string>
     <string name="lock_example_title">"Příklad gesta"</string>
-    <string name="lock_example_message">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni provést vlastní gesto, zvolte tlačítko Další."</string>
+    <string name="lock_example_message">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni nakreslit vlastní gesto, zvolte tlačítko Další."</string>
     <string name="manageapplications_settings_title">"Správa aplikací"</string>
     <string name="manageapplications_settings_summary">"Spravovat a odebrat instalované aplikace"</string>
     <string name="applications_settings">"Aplikace"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="allow_mock_location">"Povoluje simulované polohy"</string>
     <string name="allow_mock_location_summary">"Povoluje simulované polohy"</string>
-    <string name="gadget_picker_title">"Zvolte gadget"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Podrobnosti pro UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Podrobnosti o používání sítě aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Balíčky sdílející toto UID:"</string>
     <string name="battery_history_no_data">"Údaje o využití baterie nejsou k dispozici"</string>
     <string name="battery_history_sensor">"Senzor:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Senzor je používán následujícími balíčky:"</string>
     <string name="battery_history_sensor_usage">"Použito <xliff:g id="COUNT">%1$d</xliff:g>krát balíčkem <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Použito <xliff:g id="COUNT">%1$d</xliff:g>krát některým z následujících:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Doba se zapnutou obrazovkou:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"Na baterii:"</string>
     <string name="battery_history_screen_on_plugged">"Připojeno:"</string>
     <string name="usage_stats_label">"Statistika použití"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5cc368f..e3f0ec1 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Niemals im Netzbetrieb"</item>
     <item>"Niemals"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU-Verwendung"</item>
-    <item>"Netzwerk-Nutzung"</item>
-    <item>"Sensornutzung"</item>
-    <item>"Display eingeschaltet"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Seit Gerätzurücksetzung"</item>
-    <item>"Vor dem letzten Starten"</item>
-    <item>"Seit dem letzten Starten"</item>
-    <item>"Seit dem letzten Ausstecken"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Nutzungszeit"</item>
     <item>"Startzähler"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e1f2ea4..68790d5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"Nicht verbunden"</string>
     <string name="bluetooth_disconnecting">"Verbindung wird getrennt..."</string>
     <string name="bluetooth_connecting">"Verbindung wird hergestellt..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Pairing mit diesem Gerät"</string>
     <string name="bluetooth_pairing">"Pairing…"</string>
-    <string name="bluetooth_paired">"Gepaart. Nicht verbunden."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"Freisprechfunktion/Headset"</string>
     <string name="progress_scanning">"Scannen..."</string>
     <string name="bluetooth_notif_ticker">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title">"Pairing-Anfrage"</string>
-    <string name="bluetooth_notif_message">"Zum Pairing auswählen"</string>
+    <string name="bluetooth_notif_message">"Zum Pairing auswählen "</string>
     <string name="date_and_time">"Einstellungen"</string>
     <string name="date_time_12_hour_sample">"1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Zeitzone auswählen"</string>
     <string name="display_preview_label">"Vorschau:"</string>
     <string name="display_font_size_label">"Schriftgröße:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> senden"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"SD-Karte formatieren"</string>
     <string name="sd_format_summary">"SD-Karte formatieren (löschen)"</string>
     <string name="sd_unavailable">"Nicht verfügbar"</string>
-    <string name="read_only">"(schreibgeschützt)"</string>
+    <string name="read_only">" (schreibgeschützt)"</string>
     <string name="battery_status_title">"Akkustatus"</string>
     <string name="battery_level_title">"Akkuladung"</string>
     <string name="apn_settings">"APNs"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location">"Falsche Standorte zulassen"</string>
     <string name="allow_mock_location_summary">"Falsche Standorte zulassen"</string>
-    <string name="gadget_picker_title">"Gadget auswählen"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Details für UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Netzwerk-Nutzungsdetails für <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Pakete, die diese UID teilen:"</string>
     <string name="battery_history_no_data">"Keine Akku-Nutzungsdaten verfügbar"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Sensor verwendet von Paketen:"</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="COUNT">%1$d</xliff:g> mal von <xliff:g id="PACKAGE">%2$s</xliff:g> verwendet"</string>
     <string name="battery_history_sensor_usage_multi">"<xliff:g id="COUNT">%1$d</xliff:g> mal von einem der folgenden verwendet:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Zeit mit Display eingeschaltet:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"Auf Akku:"</string>
     <string name="battery_history_screen_on_plugged">"Eingesteckt:"</string>
     <string name="usage_stats_label">"Nutzungsstatistik"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 8639cfe..3129a72 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Nunca si está conectado"</item>
     <item>"Nunca"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Uso de CPU"</item>
-    <item>"Uso de red"</item>
-    <item>"Uso del sensor"</item>
-    <item>"Tiempo de pantalla activa"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Desde el restablecimiento del dispositivo"</item>
-    <item>"Antes del último reinicio"</item>
-    <item>"Desde el último reinicio"</item>
-    <item>"Desde la última vez que se desconectó"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Tiempo de uso"</item>
     <item>"Número de inicios"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b860fac..e22ee4b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,8 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Desconocido"</string>
-    <string name="turn_on_radio">"Activar radio"</string>
-    <string name="turn_off_radio">"Desactivar radio"</string>
+    <string name="turn_on_radio">"Activar señal móvil"</string>
+    <string name="turn_off_radio">"Desactivar señal móvil"</string>
     <string name="turn_on_qxdm">"Habilitar registro QXDM de SD"</string>
     <string name="turn_off_qxdm">"Inhabilitar registro QXDM de SD"</string>
     <string name="radioInfo_menu_viewADN">"Ver libreta de direcciones de tarjeta SIM"</string>
@@ -31,7 +31,7 @@
     <string name="radioInfo_service_in">"En servicio"</string>
     <string name="radioInfo_service_out">"Fuera de servicio"</string>
     <string name="radioInfo_service_emergency">"Sólo llamadas de emergencia"</string>
-    <string name="radioInfo_service_off">"Radio desconectada"</string>
+    <string name="radioInfo_service_off">"Señal móvil desactivada"</string>
     <string name="radioInfo_roaming_in">"Itinerancia"</string>
     <string name="radioInfo_roaming_not">"Sin itinerancia"</string>
     <string name="radioInfo_phone_idle">"Inactivo"</string>
@@ -48,7 +48,7 @@
     <string name="radioInfo_display_asu">"asu"</string>
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
-    <string name="sdcard_unmount">"Desmontar tarjeta SD"</string>
+    <string name="sdcard_unmount">"Desactivar tarjeta SD"</string>
     <string name="sdcard_format">"Formatear tarjeta SD"</string>
     <string name="small_font">"Pequeño"</string>
     <string name="medium_font">"Mediano"</string>
@@ -94,23 +94,23 @@
     <string name="bluetooth_disconnected">"Desconectada"</string>
     <string name="bluetooth_disconnecting">"Desconectando..."</string>
     <string name="bluetooth_connecting">"Estableciendo conexión..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Sincronizar con este dispositivo"</string>
     <string name="bluetooth_pairing">"Sincronizando..."</string>
-    <string name="bluetooth_paired">"Sincronizado. Desconectada."</string>
+    <string name="bluetooth_paired">"Sincronizado pero no conectado"</string>
     <string name="bluetooth_device">"manos libres/auriculares"</string>
     <string name="progress_scanning">"Buscando..."</string>
     <string name="bluetooth_notif_ticker">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_notif_title">"Solicitud de sincronización"</string>
-    <string name="bluetooth_notif_message">"Seleccionar dispositivo para sincronización"</string>
+    <string name="bluetooth_notif_message">"Seleccionar dispositivo para sincronización "</string>
     <string name="date_and_time">"Configuración de fecha y hora"</string>
     <string name="date_time_12_hour_sample">"1:00 p.m."</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Seleccionar zona horaria"</string>
     <string name="display_preview_label">"Vista previa:"</string>
     <string name="display_font_size_label">"Tamaño de fuente:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Enviar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -144,10 +144,10 @@
     <string name="radio_info_signal_strength_label">"Intensidad de la señal:"</string>
     <string name="radio_info_call_status_label">"Estado de la llamada:"</string>
     <string name="radio_info_ppp_sent_label">"PPP enviado:"</string>
-    <string name="radio_info_radio_resets_label">"Restablecimientos de radio:"</string>
+    <string name="radio_info_radio_resets_label">"Restablecimientos de señal móvil:"</string>
     <string name="radio_info_message_waiting_label">"Mensaje en espera:"</string>
     <string name="radio_info_phone_number_label">"Número de teléfono:"</string>
-    <string name="radio_info_band_mode_label">"Seleccionar banda de radio"</string>
+    <string name="radio_info_band_mode_label">"Seleccionar banda de señal móvil"</string>
     <string name="radio_info_network_type_label">"Tipo de red:"</string>
     <string name="radio_info_set_perferred_label">"Establecer tipo de red preferido:"</string>
     <string name="radio_info_ping_ipaddr">"Hacer ping a DirIP:"</string>
@@ -167,14 +167,14 @@
     <string name="sdcard_changes_instructions">"Los cambios se aplican cuando se vuelve a conectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Habilitar almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Bytes totales:"</string>
-    <string name="sdcard_settings_not_present_status">"Ninguna tarjeta SD"</string>
+    <string name="sdcard_settings_not_present_status">"Falta la tarjeta SD"</string>
     <string name="sdcard_settings_available_bytes_label">"Bytes disponibles:"</string>
     <string name="sdcard_settings_mass_storage_status">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo."</string>
-    <string name="sdcard_settings_unmounted_status">"Ahora es seguro extraer la tarjeta SD."</string>
+    <string name="sdcard_settings_unmounted_status">"Es seguro extraer la tarjeta SD"</string>
     <string name="sdcard_settings_bad_removal_status">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label">"Bytes utilizados:"</string>
     <string name="sdcard_settings_scanning_status">"Buscando medios en tarjeta SD..."</string>
-    <string name="sdcard_settings_read_only_status">"Tarjeta SD montada en modo de sólo lectura"</string>
+    <string name="sdcard_settings_read_only_status">"Tarjeta SD activada en modo de sólo lectura"</string>
     <string name="next_label">"Siguiente"</string>
     <string name="language_picker_title">"Configuración local"</string>
     <string name="select_your_language">"Selecciona el idioma que prefieras."</string>
@@ -212,7 +212,7 @@
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Activar Bluetooth"</string>
     <string name="bluetooth_settings">"Bluetooth"</string>
-    <string name="bluetooth_settings_title">"Configuración de Bluetooth"</string>
+    <string name="bluetooth_settings_title">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_settings_summary">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
     <string name="bluetooth_pin_entry">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_device_info">"Información de dispositivo Bluetooth"</string>
@@ -405,7 +405,7 @@
     <string name="device_status">"Estado"</string>
     <string name="device_status_summary">"IMEI, número de teléfono, señal, etc."</string>
     <string name="storage_settings_title">"Almacenamiento"</string>
-    <string name="storage_settings_summary">"Tarjeta de SD sin montar, ver almacenamiento disponible"</string>
+    <string name="storage_settings_summary">"Tarjeta de SD sin activar, ver almacenamiento disponible"</string>
     <string name="status_number">"Número de teléfono"</string>
     <string name="status_network_type">"Tipo de red móvil"</string>
     <string name="status_data_state">"Estado de red móvil"</string>
@@ -424,12 +424,12 @@
     <string name="sd_memory">"Tarjeta SD"</string>
     <string name="memory_available">"Espacio disponible"</string>
     <string name="memory_size">"Espacio total"</string>
-    <string name="sd_eject">"Desmontar tarjeta SD"</string>
-    <string name="sd_eject_summary">"Desmonta la tarjeta SD para extraerla con seguridad"</string>
+    <string name="sd_eject">"Desactivar tarjeta SD"</string>
+    <string name="sd_eject_summary">"Desactiva la tarjeta SD antes de extraerla para evitar la pérdida de datos."</string>
     <string name="sd_format">"Formatear tarjeta SD"</string>
     <string name="sd_format_summary">"Formatear (borrar) la tarjeta SD"</string>
     <string name="sd_unavailable">"No disponible"</string>
-    <string name="read_only">"(Sólo lectura)"</string>
+    <string name="read_only">" (Sólo lectura)"</string>
     <string name="battery_status_title">"Estado de la batería"</string>
     <string name="battery_level_title">"Nivel de batería"</string>
     <string name="apn_settings">"APN"</string>
@@ -479,7 +479,7 @@
     <string name="network_settings_title">"Redes móviles"</string>
     <string name="network_settings_summary">"Establecer opciones para itinerancia, redes, APN"</string>
     <string name="location_title">"Fuentes de Mi Ubicación"</string>
-    <string name="location_network_based">"Utilizar redes inalámbricas"</string>
+    <string name="location_network_based">"Usar redes inalámbricas"</string>
     <string name="location_networks_disabled">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
     <string name="location_neighborhood_level">"Ubicación determinada por redes móviles o Wi-Fi"</string>
     <string name="location_gps">"Habilitar satélites GPS"</string>
@@ -500,7 +500,7 @@
     <string name="lockpattern_need_to_unlock">"Confirmar patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong">"Inténtalo de nuevo:"</string>
     <string name="lockpattern_recording_intro_header">"Crear un patrón de desbloqueo"</string>
-    <string name="lockpattern_recording_intro_footer">"Pulsa MENU para obtener ayuda."</string>
+    <string name="lockpattern_recording_intro_footer">"Pulsa la tecla de menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress">"Levanta el dedo cuando termines."</string>
     <string name="lockpattern_recording_incorrect_too_short">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>
     <string name="lockpattern_pattern_entered_header">"Patrón grabado"</string>
@@ -509,7 +509,7 @@
     <string name="lockpattern_confirm_button_text">"Confirmar"</string>
     <string name="lockpattern_restart_button_text">"Crear un patrón nuevo"</string>
     <string name="lockpattern_retry_button_text">"Reintentar"</string>
-    <string name="lockpattern_continue_button_text">"Continuar"</string>
+    <string name="lockpattern_continue_button_text">"Seguir"</string>
     <string name="lockpattern_settings_title">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_enable_title">"Patrón obligatorio"</string>
     <string name="lockpattern_settings_enable_summary">"Se debe crear un patrón para desbloquear la pantalla."</string>
@@ -521,11 +521,11 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Se han realizado demasiados intentos incorrectos."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="skip_button_label">"Cancelar"</string>
-    <string name="next_button_label">"Siguiente"</string>
+    <string name="next_button_label">"Seguir"</string>
     <string name="lock_title">"Protección del teléfono"</string>
-    <string name="lock_intro_message"><font size="17">"Protege el teléfono de usos no autorizados mediante la creación de un patrón de desbloqueo de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la siguiente pantalla, puedes observar cómo se crea un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés preparado, crea tu propio patrón de desbloqueo personal. Puedes experimentar con distintos patrones, pero recuerda que debes conectar al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Vuelve a dibujar el patrón para confirmarlo. "\n<font height="17">\n</font><b>"Si estás preparado para comenzar, selecciona \"Siguiente\""</b>". "\n<font height="3">\n</font>"Para dejar el teléfono desprotegido, selecciona \"Cancelar\"."</font></string>
+    <string name="lock_intro_message"><font size="17">"Protege el teléfono de usos no autorizados mediante la creación de un patrón de desbloqueo de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la siguiente pantalla, puedes observar cómo se crea un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés preparado, crea tu propio patrón de desbloqueo personal. Puedes experimentar con distintos patrones, pero recuerda que debes conectar al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Vuelve a dibujar el patrón para confirmarlo. "\n<font height="17">\n</font><b>"Si estás preparado para comenzar, selecciona \"Seguir\""</b>". "\n<font height="3">\n</font>"Para dejar el teléfono desprotegido, selecciona \"Cancelar\"."</font></string>
     <string name="lock_example_title">"Patrón de ejemplo"</string>
-    <string name="lock_example_message">"Une al menos cuatro puntos."\n" "\n"Selecciona \"Siguiente\" cuando estés preparado para crear tu propio patrón."</string>
+    <string name="lock_example_message">"Une al menos cuatro puntos."\n" "\n"Selecciona \"Seguir\" cuando estés preparado para crear tu propio patrón."</string>
     <string name="manageapplications_settings_title">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings">"Aplicaciones"</string>
@@ -573,13 +573,13 @@
     <string name="computing_size">"Calculando…"</string>
     <string name="invalid_size_value">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg">"No tienes instalada ninguna aplicación externa."</string>
-    <string name="language_settings">"Ajuste regional y de texto"</string>
-    <string name="language_settings_summary">"Establecer opciones de autocorrección, introducción de texto y configuración local (idioma y país)"</string>
+    <string name="language_settings">"Idioma y país"</string>
+    <string name="language_settings_summary">"Configuración local, opciones de autocorrección e introducción de texto"</string>
     <string name="language_category">"Configuración local"</string>
     <string name="text_category">"Configuración de texto"</string>
     <string name="phone_language">"Seleccionar configuración local"</string>
     <string name="phone_language_summary">"Seleccionar idioma y región"</string>
-    <string name="auto_replace">"Reemplazar automáticamente"</string>
+    <string name="auto_replace">"Corrección automática"</string>
     <string name="auto_replace_summary">"Corregir palabras con errores de escritura"</string>
     <string name="auto_caps">"Mayúsculas automáticas"</string>
     <string name="auto_caps_summary">"Escribir en mayúsculas la primera letra de las frases"</string>
@@ -622,7 +622,10 @@
     <string name="keep_screen_on_summary">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
     <string name="allow_mock_location">"Permitir ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary">"Permitir ubicaciones simuladas"</string>
-    <string name="gadget_picker_title">"Seleccionar gadget"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Detalles del ID único %d"</string>
     <string name="battery_history_uid">"ID único <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Detalles de uso de red para <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +644,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Paquetes que comparten este ID único:"</string>
     <string name="battery_history_no_data">"No hay datos disponibles sobre el uso de la batería."</string>
     <string name="battery_history_sensor">"Sensor:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Sensor utilizado por paquetes:"</string>
     <string name="battery_history_sensor_usage">"Utilizado <xliff:g id="COUNT">%1$d</xliff:g> veces por <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Utilizado <xliff:g id="COUNT">%1$d</xliff:g> veces por uno de:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Tiempo transcurrido con la pantalla encendida:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"En la batería:"</string>
     <string name="battery_history_screen_on_plugged">"Conectado:"</string>
     <string name="usage_stats_label">"Estadísticas de uso"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index a371ee8..6517114 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -34,7 +34,7 @@
   </string-array>
   <string-array name="wifi_security_entries">
     <item>"Automatique"</item>
-    <item>"Aucun"</item>
+    <item>"Aucune"</item>
     <item>"WEP"</item>
     <item>"WPA personnel"</item>
     <item>"WPA2 personnel"</item>
@@ -55,18 +55,15 @@
     <item>"Jamais si branché"</item>
     <item>"Jamais"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Utilisation de l\'UC"</item>
-    <item>"Utilisation du réseau"</item>
-    <item>"Utilisation du capteur"</item>
-    <item>"Écran actualisé"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Depuis la réinitialisation de l\'appareil"</item>
-    <item>"Avant le dernier démarrage"</item>
-    <item>"Depuis le dernier démarrage"</item>
-    <item>"Depuis le dernier débranchement"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Temps d\'utilisation"</item>
     <item>"Nombre de lancements"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d23ac48..7d8e534 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,12 +21,12 @@
     <string name="turn_on_qxdm">"Activer le journal SD QXDM"</string>
     <string name="turn_off_qxdm">"Désactiver le journal QXMD SD"</string>
     <string name="radioInfo_menu_viewADN">"Afficher le carnet d\'adresses de la carte SIM"</string>
-    <string name="radioInfo_menu_viewFDN">"Afficher les numéros de numérotation fixe"</string>
+    <string name="radioInfo_menu_viewFDN">"Afficher les numéros autorisés"</string>
     <string name="radioInfo_menu_viewSDN">"Afficher les numéros de service"</string>
     <string name="radioInfo_menu_getPDP">"Récupérer la liste PDP"</string>
     <string name="radioInfo_menu_enableData">"Activer la connexion des données"</string>
     <string name="radioInfo_menu_disableData">"Désactiver la connexion des données"</string>
-    <string name="radioInfo_menu_enableDataOnBoot">"Activer les données lors du démarrage"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Activer les données au démarrage"</string>
     <string name="radioInfo_menu_disableDataOnBoot">"Désactiver les données lors du démarrage"</string>
     <string name="radioInfo_service_in">"Service en cours"</string>
     <string name="radioInfo_service_out">"Hors-service"</string>
@@ -58,7 +58,7 @@
     <string name="battery_info_status_label">"État de la batterie :"</string>
     <string name="battery_info_scale_label">"Batterie :"</string>
     <string name="battery_info_level_label">"Niveau de la batterie :"</string>
-    <string name="battery_info_health_label">"Santé de la batterie :"</string>
+    <string name="battery_info_health_label">"État de la batterie :"</string>
     <string name="battery_info_technology_label">"Technologie de la batterie :"</string>
     <string name="battery_info_voltage_label">"Voltage de la batterie :"</string>
     <string name="battery_info_voltage_units">"mV"</string>
@@ -94,23 +94,23 @@
     <string name="bluetooth_disconnected">"Déconnecté"</string>
     <string name="bluetooth_disconnecting">"Déconnexion…"</string>
     <string name="bluetooth_connecting">"Connexion…"</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Associer à ce périphérique"</string>
     <string name="bluetooth_pairing">"Association…"</string>
-    <string name="bluetooth_paired">"Associé. Déconnecté."</string>
+    <string name="bluetooth_paired">"Associé mais non connecté"</string>
     <string name="bluetooth_device">"mains libres/casque"</string>
     <string name="progress_scanning">"Recherche"</string>
     <string name="bluetooth_notif_ticker">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title">"Demande d\'association"</string>
-    <string name="bluetooth_notif_message">"Sélectionner pour associer à"</string>
+    <string name="bluetooth_notif_message">"Sélectionner pour associer à "</string>
     <string name="date_and_time">"Paramètres d\'heure et de date"</string>
     <string name="date_time_12_hour_sample">"13:00 h"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Choisir fuseau horaire"</string>
     <string name="display_preview_label">"Aperçu :"</string>
     <string name="display_font_size_label">"Taille de police :"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Envoyer <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g> :"</string>
@@ -173,7 +173,7 @@
     <string name="sdcard_settings_unmounted_status">"Vous pouvez maintenant retirer la carte SD en toute sécurité."</string>
     <string name="sdcard_settings_bad_removal_status">"La carte SD a été retirée pendant son utilisation !"</string>
     <string name="sdcard_settings_used_bytes_label">"Octets utilisés :"</string>
-    <string name="sdcard_settings_scanning_status">"Recherche de médias sur la carte SD…"</string>
+    <string name="sdcard_settings_scanning_status">"Recherche de fichiers multimédia sur la carte SD…"</string>
     <string name="sdcard_settings_read_only_status">"Carte SD montée en lecture seule"</string>
     <string name="next_label">"Suivant"</string>
     <string name="language_picker_title">"Paramètres régionaux"</string>
@@ -192,7 +192,7 @@
     <string name="airplane_mode_summary">"Désactiver toutes les connexions sans fil"</string>
     <string name="airplane_mode_turning_on">"Désactivation des connexions sans fil…"</string>
     <string name="airplane_mode_turning_off">"Activation des connexions sans fil…"</string>
-    <string name="radio_controls_title">"Commandes sans fil"</string>
+    <string name="radio_controls_title">"Connexions sans fil"</string>
     <string name="radio_controls_summary">"Gérer le Wi-Fi, le mode Bluetooth, le mode avion et les réseaux mobiles"</string>
     <string name="date_and_time_settings_title">"Date et heure"</string>
     <string name="date_and_time_settings_summary">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
@@ -203,10 +203,10 @@
     <string name="date_time_set_time">"Définir l\'heure"</string>
     <string name="date_time_set_timezone">"Choisir un fuseau horaire"</string>
     <string name="date_time_set_date">"Définir la date"</string>
-    <string name="date_time_date_format">"Sélectionner un format de date"</string>
+    <string name="date_time_date_format">"Sélectionner format de date"</string>
     <string name="zone_list_menu_sort_alphabetically">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone">"Trier par fuseau horaire"</string>
-    <string name="security_settings_title">"Sécurité et position géo."</string>
+    <string name="security_settings_title">"Sécurité et localisation"</string>
     <string name="security_settings_summary">"Définir Ma position, le déverrouillage de l\'écran et le blocage de la carte SIM"</string>
     <string name="security_passwords_title">"Mots de passe"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
@@ -229,7 +229,7 @@
     <string name="bluetooth_device_context_disconnect_unpair">"Déconnecter et dissocier"</string>
     <string name="bluetooth_device_context_connect_advanced">"Options…"</string>
     <string name="bluetooth_connect_specific_profiles_title">"Se connecter à…"</string>
-    <string name="bluetooth_profile_a2dp">"Médias"</string>
+    <string name="bluetooth_profile_a2dp">"Multimédia"</string>
     <string name="bluetooth_profile_headset">"Téléphone"</string>
     <string name="bluetooth_summary_connected_to_a2dp">"Connecté aux paramètres audio du média"</string>
     <string name="bluetooth_summary_connected_to_headset">"Connecté aux paramètres audio du téléphone"</string>
@@ -248,7 +248,7 @@
     <string name="wifi_settings">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_category">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_summary">"Configurer et gérer les points d\'accès sans fil"</string>
-    <string name="forget_network">"Oublier"</string>
+    <string name="forget_network">"Retirer"</string>
     <string name="wifi_status">"État"</string>
     <string name="wifi_link_speed">"Vitesse"</string>
     <string name="wifi_signal_3">"Excellente"</string>
@@ -276,14 +276,14 @@
     <string name="error_connecting">"Impossible de se connecter au réseau."</string>
     <string name="error_saving">"Impossible d\'enregistrer le réseau"</string>
     <string name="connect">"Se connecter"</string>
-    <string name="connect_to_blank">"Se connecter à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_to_blank">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="please_type_passphrase">"Mot de passe sans fil"</string>
     <string name="please_type_hex_key">"Touche hex WEP (0-9, A-F)"</string>
     <string name="wifi_show_password">"Afficher le mot de passe"</string>
     <string name="scan_wifi">"Rechercher"</string>
     <string name="summary_not_in_range">"Hors de portée"</string>
     <string name="summary_remembered">"Réseaux enregistrés"</string>
-    <string name="summary_connection_failed">"Échec de la connexion. Veuillez sélectionner cette option pour réessayer."</string>
+    <string name="summary_connection_failed">"Échec de la connexion. Sélectionnez cette option pour réessayer."</string>
     <string name="wifi_access_points">"Réseaux Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID du réseau"</string>
     <string name="wifi_security">"Sécurité"</string>
@@ -306,7 +306,7 @@
     <string name="wifi_gateway">"Passerelle"</string>
     <string name="wifi_netmask">"Masque de réseau"</string>
     <string name="wifi_context_menu_connect">"Se connecter au réseau"</string>
-    <string name="wifi_context_menu_forget">"Oublier le réseau"</string>
+    <string name="wifi_context_menu_forget">"Retirer le réseau"</string>
     <string name="wifi_context_menu_change_password">"Modifier le mot de passe"</string>
     <string name="wifi_advanced_titlebar">"Avancés"</string>
     <string name="wifi_setting_num_channels_title">"Domaine régulateur"</string>
@@ -337,12 +337,12 @@
     <string name="sound_settings">"Paramètres sonores"</string>
     <string name="sound_and_display_settings_summary">"Configurer les sonneries, les notifications et la luminosité de l\'écran"</string>
     <string name="silent_mode_title">"Mode silencieux"</string>
-    <string name="silent_mode_summary">"Tous les sons sauf pour les médias et les alarmes sont en mode silencieux"</string>
+    <string name="silent_mode_summary">"Aucun son sauf pour le multimédia et le réveil"</string>
     <string name="ringtone_title">"Sonnerie du téléphone"</string>
     <string name="ringtone_summary">"Configurer la sonnerie par défaut pour les appels entrants"</string>
     <string name="ring_volume_title">"Volume de la sonnerie"</string>
     <string name="ring_volume_summary">"Régler le volume pour les appels entrants"</string>
-    <string name="vibrate_title">"Vibration du téléphone"</string>
+    <string name="vibrate_title">"Vibreur"</string>
     <string name="vibrate_summary">"Activer le vibreur pour les appels entrants"</string>
     <string name="notification_sound_title">"Sonnerie de notification"</string>
     <string name="notification_sound_summary">"Définir votre sonnerie de notification par défaut"</string>
@@ -350,14 +350,14 @@
     <string name="notification_volume_title">"Volume des notifications"</string>
     <string name="checkbox_notification_same_as_incoming_call">"Utiliser le volume des appels entrants pour les notifications"</string>
     <string name="notification_sound_dialog_title">"Sélectionner une sonnerie de notification"</string>
-    <string name="media_volume_title">"Volume des médias"</string>
-    <string name="media_volume_summary">"Régler le volume de la musique et des vidéos"</string>
+    <string name="media_volume_title">"Volume"</string>
+    <string name="media_volume_summary">"Régler le volume pour la musique et les vidéos"</string>
     <string name="dtmf_tone_enable_title">"Tonalité touches audible"</string>
-    <string name="dtmf_tone_enable_summary_on">"Jouer des tonalités lors de l\'utilisation du clavier"</string>
-    <string name="dtmf_tone_enable_summary_off">"Jouer les tonalités lors de l\'utilisation du clavier"</string>
-    <string name="sound_effects_enable_title">"Sélection audible"</string>
+    <string name="dtmf_tone_enable_summary_on">"Activer la tonalité des touches du clavier"</string>
+    <string name="dtmf_tone_enable_summary_off">"Activer la tonalité des touches du clavier"</string>
+    <string name="sound_effects_enable_title">"Sélections audibles"</string>
     <string name="sound_effects_enable_summary_on">"Lire les sons lors des sélections à l\'écran"</string>
-    <string name="sound_effects_enable_summary_off">"Lire le son lors des sélections à l\'écran"</string>
+    <string name="sound_effects_enable_summary_off">"Jouer un son lors des sélections à l\'écran"</string>
     <string name="play_media_notification_sounds_enable_title">"Notifications de la carte SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on">"Désactiver les notifications sonores de la carte SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off">"Activer les notifications sonores de la carte SD"</string>
@@ -365,19 +365,19 @@
     <string name="sync_settings_summary">"Sélectionner les applications à synchroniser"</string>
     <string name="display_settings">"Afficher les paramètres"</string>
     <string name="animations_title">"Animation"</string>
-    <string name="animations_summary_on">"Afficher l\'animation lors de l\'ouverture/fermeture de fenêtres"</string>
-    <string name="animations_summary_off">"Afficher l\'animation lors de l\'ouverture/fermeture de fenêtres"</string>
+    <string name="animations_summary_on">"Animation lors de l\'ouverture et la fermeture de fenêtres"</string>
+    <string name="animations_summary_off">"Animation lors de l\'ouverture et la fermeture de fenêtres"</string>
     <string name="brightness">"Luminosité"</string>
     <string name="brightness_summary">"Régler la luminosité de l\'écran"</string>
     <string name="screen_timeout">"Mise en veille de l\'écran"</string>
     <string name="screen_timeout_summary">"Définir le délai avant la mise hors tension automatique de l\'écran"</string>
-    <string name="sim_lock_settings">"Paramètres de blocage de la carte SIM"</string>
+    <string name="sim_lock_settings">"Paramètres de blocage carte SIM"</string>
     <string name="sim_lock_settings_category">"Configurer blocage SIM"</string>
     <string name="sim_lock_settings_title">"Blocage de la carte SIM"</string>
     <string name="sim_pin_toggle">"Bloquer la carte SIM"</string>
     <string name="sim_lock_on">"Demander le code PIN pour utiliser le téléphone"</string>
     <string name="sim_lock_off">"Demander le code PIN pour utiliser le téléphone"</string>
-    <string name="sim_pin_change">"Modifier le code PIN de la carte SIM"</string>
+    <string name="sim_pin_change">"Modifier PIN de la carte SIM"</string>
     <string name="sim_enter_pin">"Code PIN de la carte SIM"</string>
     <string name="sim_enable_sim_lock">"Bloquer la carte SIM"</string>
     <string name="sim_disable_sim_lock">"Débloquer la carte SIM"</string>
@@ -429,7 +429,7 @@
     <string name="sd_format">"Formater la carte SD"</string>
     <string name="sd_format_summary">"Formater (effacer) la carte SD"</string>
     <string name="sd_unavailable">"Non disponible"</string>
-    <string name="read_only">"(Lecture seule)"</string>
+    <string name="read_only">" (Lecture seule)"</string>
     <string name="battery_status_title">"État de la batterie"</string>
     <string name="battery_level_title">"Niveau de la batterie"</string>
     <string name="apn_settings">"APN"</string>
@@ -457,8 +457,8 @@
     <string name="error_apn_empty">"Le champ Nom de point d\'accès (APN) doit être renseigné."</string>
     <string name="error_mcc_not3">"Le champ MCC doit contenir 3 chiffres."</string>
     <string name="error_mnc_not23">"Le champ MNC doit contenir 2 ou 3 chiffres."</string>
-    <string name="master_clear_title">"Réinitialisation des valeurs d\'usine"</string>
-    <string name="master_clear_summary">"Efface toutes les données du téléphone"</string>
+    <string name="master_clear_title">"Réinit. valeurs d\'usine"</string>
+    <string name="master_clear_summary">"Effacer toutes les données du téléphone"</string>
     <string name="master_clear_desc">"Cette action réinitialisera le téléphone à ses valeurs d\'usine et effacera toutes les données et applications téléchargées !"</string>
     <string name="master_clear_button_text">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc">"Réinitialiser le téléphone et effacer toutes les données et applications ? Cette action ne peut être inversée."</string>
@@ -484,7 +484,7 @@
     <string name="location_neighborhood_level">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
     <string name="location_gps">"Activer les satellites GPS"</string>
     <string name="location_street_level">"Localisation précise au niveau de la rue lors du positionnement géographique (désélectionner pour économiser la batterie)"</string>
-    <string name="location_gps_disabled">"Localiser au niveau rue (requiert + de batterie que la vue du ciel)"</string>
+    <string name="location_gps_disabled">"Localiser au niveau rue (requiert + de batterie et une vue dégagée)"</string>
     <string name="about_settings">"À propos du téléphone"</string>
     <string name="about_settings_summary">"Informations légales, état du téléphone et version du logiciel"</string>
     <string name="legal_information">"Informations légales"</string>
@@ -492,7 +492,7 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Conditions d\'utilisation"</string>
-    <string name="settings_license_activity_title">"Ouvrir les licences sources"</string>
+    <string name="settings_license_activity_title">"Ouvrir licences source"</string>
     <string name="settings_license_activity_unavailable">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading">"Chargement..."</string>
     <string name="lock_settings_title">"Motif de déverrouillage de l\'écran"</string>
@@ -523,7 +523,7 @@
     <string name="skip_button_label">"Annuler"</string>
     <string name="next_button_label">"Suivant"</string>
     <string name="lock_title">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un motif personnel de déverrouillage de l\'écran."\n<font height="17">\n</font><b>"1"</b>" L\'écran suivant vous présente un exemple de motif. "\n<font height="17">\n</font><b>"2"</b>" Lorsque vous êtes prêt, dessinez votre propre motif de déverrouillage. Essayez différents motifs, mais reliez au moins quatre points."\n<font height="17">\n</font><b></b>"Reproduisez votre motif pour confirmer."\n<font height="17">\n</font><b>"Vous êtes prêt à commencer ? Sélectionnez Suivant."</b>\n<font height="3">\n</font>"Pour laisser votre téléphone sans protection, sélectionnez Annuler."</font></string>
+    <string name="lock_intro_message"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un motif personnel de déverrouillage de l\'écran."\n<font height="17">\n</font><b>"1"</b>" L\'écran suivant vous présente un exemple de motif. "\n<font height="17">\n</font><b>"2"</b>" Lorsque vous êtes prêt, dessinez votre propre motif de déverrouillage. Essayez différents motifs, mais reliez au moins quatre points."\n<font height="17">\n</font><b></b>"Reproduisez votre motif pour confirmer."\n<font height="17">\n</font><b>"Pour commencer, sélectionnez \"Suivant\"."</b>\n<font height="3">\n</font>"Si vous ne souhaitez pas activer cette protection, sélectionnez \"Annuler\"."</font></string>
     <string name="lock_example_title">"Exemple de motif"</string>
     <string name="lock_example_message">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" lorsque vous voulez créer votre propre motif."</string>
     <string name="manageapplications_settings_title">"Gérer les applications"</string>
@@ -556,7 +556,7 @@
     <string name="sort_order_size">"Trier par taille"</string>
     <string name="manage_space_text">"Gérer l\'espace"</string>
     <string name="filter">"Filtrer"</string>
-    <string name="filter_dlg_title">"Sélectionner les options du filtre"</string>
+    <string name="filter_dlg_title">"Options du filtre"</string>
     <string name="filter_apps_all">"Tous"</string>
     <string name="filter_apps_third_party">"Tiers"</string>
     <string name="filter_apps_running">"En cours d\'exécution"</string>
@@ -579,11 +579,11 @@
     <string name="text_category">"Paramètres du texte"</string>
     <string name="phone_language">"Langue et région"</string>
     <string name="phone_language_summary">"Sélectionner une langue et un pays"</string>
-    <string name="auto_replace">"Remplacement auto."</string>
+    <string name="auto_replace">"Remplacement auto"</string>
     <string name="auto_replace_summary">"Corriger les mots mal saisis"</string>
-    <string name="auto_caps">"Maj auto"</string>
+    <string name="auto_caps">"Majuscule auto"</string>
     <string name="auto_caps_summary">"Mettre une majuscule en début de phrase"</string>
-    <string name="auto_punctuate">"Ponctuation auto."</string>
+    <string name="auto_punctuate">"Ponctuation auto"</string>
     <string name="hardkeyboard_category">"Paramètres du clavier physique"</string>
     <string name="auto_punctuate_summary">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
     <string name="show_password">"Mots de passe visibles"</string>
@@ -613,7 +613,7 @@
     <string name="quick_launch_display_mode_shortcuts">"Raccourcis"</string>
     <string name="input_methods_settings_title">"Saisie de texte"</string>
     <string name="input_methods_settings_summary">"Gérer les options de saisie de texte"</string>
-    <string name="input_methods_settings_label_format">"%s paramètres"</string>
+    <string name="input_methods_settings_label_format">"Paramètres %s"</string>
     <string name="development_settings_title">"Développement"</string>
     <string name="development_settings_summary">"Définir les options pour le développement de l\'application"</string>
     <string name="enable_adb">"Débogage USB"</string>
@@ -622,7 +622,10 @@
     <string name="keep_screen_on_summary">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="allow_mock_location">"Autoriser les positions géographiques fictives"</string>
     <string name="allow_mock_location_summary">"Positions fictives"</string>
-    <string name="gadget_picker_title">"Choisir un gadget"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Détails de l\'UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Données d\'utilisation du réseau pour <xliff:g id="APP_NAME">%1$s</xliff:g> :"</string>
@@ -641,10 +644,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Paquets partageant cet UID :"</string>
     <string name="battery_history_no_data">"Aucune donnée sur l\'utilisation de la batterie disponible"</string>
     <string name="battery_history_sensor">"Capteur :"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Capteur utilisé par les kits :"</string>
     <string name="battery_history_sensor_usage">"Utilisé <xliff:g id="COUNT">%1$d</xliff:g> fois par <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Utilisé <xliff:g id="COUNT">%1$d</xliff:g> fois par l\'une des applications suivantes :"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Temps utilisé avec l\'écran activé :"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"Sur la batterie :"</string>
     <string name="battery_history_screen_on_plugged">"Branchée :"</string>
     <string name="usage_stats_label">"Données statistiques"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 42373e0..b27d0c6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Mai quando collegato"</item>
     <item>"Mai"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Utilizzo CPU"</item>
-    <item>"Utilizzo della rete"</item>
-    <item>"Utilizzo sensore"</item>
-    <item>"Tempo accensione schermo"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Da ripristino dispositivo"</item>
-    <item>"Prima di ultimo avvio"</item>
-    <item>"Da ultimo avvio"</item>
-    <item>"Da ultimo scollegamento"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Tempo di utilizzo"</item>
     <item>"Conteggio avvii"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4b0b22f..24efd38 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,8 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Sconosciuto"</string>
-    <string name="turn_on_radio">"Accendi radio"</string>
-    <string name="turn_off_radio">"Disattiva radio"</string>
+    <string name="turn_on_radio">"Attiva segnale cellulare"</string>
+    <string name="turn_off_radio">"Disattiva segnale cellulare"</string>
     <string name="turn_on_qxdm">"Attiva log SD QXDM"</string>
     <string name="turn_off_qxdm">"Disattiva log SD QXDM"</string>
     <string name="radioInfo_menu_viewADN">"Visualizza rubrica SIM"</string>
@@ -31,7 +31,7 @@
     <string name="radioInfo_service_in">"In servizio"</string>
     <string name="radioInfo_service_out">"Fuori servizio"</string>
     <string name="radioInfo_service_emergency">"Solo chiamate di emergenza"</string>
-    <string name="radioInfo_service_off">"Radio disattivata"</string>
+    <string name="radioInfo_service_off">"Segnale cellulare disattivato"</string>
     <string name="radioInfo_roaming_in">"Roaming"</string>
     <string name="radioInfo_roaming_not">"Non roaming"</string>
     <string name="radioInfo_phone_idle">"Inattivo"</string>
@@ -65,8 +65,8 @@
     <string name="battery_info_temperature_label">"Temperatura batteria:"</string>
     <string name="battery_info_temperature_units">"°C"</string>
     <string name="battery_info_uptime">"Tempo dall\'avvio:"</string>
-    <string name="battery_info_awake_battery">"Tempo riattivazione batteria:"</string>
-    <string name="battery_info_awake_plugged">"Tempo riattivazione durante la carica:"</string>
+    <string name="battery_info_awake_battery">"Tempo di attività con batteria:"</string>
+    <string name="battery_info_awake_plugged">"Tempo di attività sotto carica:"</string>
     <string name="battery_info_screen_on">"Tempo accensione schermo:"</string>
     <string name="battery_info_status_unknown">"Sconosciuta"</string>
     <string name="battery_info_status_charging">"In carica"</string>
@@ -94,23 +94,23 @@
     <string name="bluetooth_disconnected">"Disconnesso"</string>
     <string name="bluetooth_disconnecting">"Disconnessione..."</string>
     <string name="bluetooth_connecting">"Connessione..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Accoppia con il dispositivo"</string>
     <string name="bluetooth_pairing">"Accoppiamento..."</string>
-    <string name="bluetooth_paired">"Accoppiato. Disconnesso."</string>
+    <string name="bluetooth_paired">"Accoppiati ma non connessi"</string>
     <string name="bluetooth_device">"vivavoce/auricolare"</string>
     <string name="progress_scanning">"Ricerca"</string>
     <string name="bluetooth_notif_ticker">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title">"Richiesta accoppiamento"</string>
-    <string name="bluetooth_notif_message">"Seleziona per accoppiare"</string>
+    <string name="bluetooth_notif_message">"Seleziona per accoppiare "</string>
     <string name="date_and_time">"Impostazioni data e ora"</string>
     <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Seleziona fuso orario"</string>
     <string name="display_preview_label">"Anteprima:"</string>
     <string name="display_font_size_label">"Dimensioni carattere:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Invia <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -144,7 +144,7 @@
     <string name="radio_info_signal_strength_label">"Intensità segnale:"</string>
     <string name="radio_info_call_status_label">"Stato chiamata:"</string>
     <string name="radio_info_ppp_sent_label">"PPP inviato:"</string>
-    <string name="radio_info_radio_resets_label">"Reimpostazioni radio:"</string>
+    <string name="radio_info_radio_resets_label">"Reimpostaz. segnale cellulare:"</string>
     <string name="radio_info_message_waiting_label">"Messaggio in attesa:"</string>
     <string name="radio_info_phone_number_label">"Numero di telefono:"</string>
     <string name="radio_info_band_mode_label">"Seleziona banda radio"</string>
@@ -248,12 +248,12 @@
     <string name="wifi_settings">"Impostazioni Wi-Fi"</string>
     <string name="wifi_settings_category">"Impostazioni Wi-Fi"</string>
     <string name="wifi_settings_summary">"Configura e gestisci punti di accesso wireless"</string>
-    <string name="forget_network">"Ignora"</string>
+    <string name="forget_network">"Elimina"</string>
     <string name="wifi_status">"Stato"</string>
     <string name="wifi_link_speed">"Velocità"</string>
     <string name="wifi_signal_3">"Eccellente"</string>
     <string name="wifi_signal_2">"Buona"</string>
-    <string name="wifi_signal_1">"Mediocre"</string>
+    <string name="wifi_signal_1">"Discreta"</string>
     <string name="wifi_signal_0">"Scarsa"</string>
     <string name="security">"Protezione"</string>
     <string name="wifi_security_open">"Apri"</string>
@@ -282,7 +282,7 @@
     <string name="wifi_show_password">"Mostra password."</string>
     <string name="scan_wifi">"Scansione"</string>
     <string name="summary_not_in_range">"Fuori portata"</string>
-    <string name="summary_remembered">"Memorizzato"</string>
+    <string name="summary_remembered">"Memorizzata"</string>
     <string name="summary_connection_failed">"Connessione non riuscita. Seleziona per riprovare"</string>
     <string name="wifi_access_points">"Reti Wi-Fi"</string>
     <string name="wifi_type_ssid">"SSID rete"</string>
@@ -306,21 +306,21 @@
     <string name="wifi_gateway">"Gateway"</string>
     <string name="wifi_netmask">"Maschera di rete"</string>
     <string name="wifi_context_menu_connect">"Connetti a rete"</string>
-    <string name="wifi_context_menu_forget">"Ignora rete"</string>
+    <string name="wifi_context_menu_forget">"Elimina rete"</string>
     <string name="wifi_context_menu_change_password">"Cambia password"</string>
     <string name="wifi_advanced_titlebar">"Avanzate"</string>
     <string name="wifi_setting_num_channels_title">"Dominio regolatore"</string>
     <string name="wifi_setting_num_channels_summary">"Imposta il numero di canali da usare"</string>
     <string name="wifi_setting_num_channels_error">"Errore durante l\'impostazione del dominio regolatore."</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> canali"</string>
-    <string name="wifi_setting_sleep_policy_title">"Criterio di sospensione Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_title">"Criteri di sospensione Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary">"Specifica quando passare da Wi-Fi a dati cellulare"</string>
-    <string name="wifi_setting_sleep_policy_error">"Errore durante l\'impostazione del criterio di sospensione."</string>
+    <string name="wifi_setting_sleep_policy_error">"Errore durante l\'impostazione dei criteri di sospensione."</string>
     <string name="wifi_advanced_mac_address_title">"Indirizzo MAC"</string>
     <string name="fragment_status_scanning">"Ricerca..."</string>
     <string name="fragment_status_connecting">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_authenticating">"Autenticazione con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
-    <string name="fragment_status_obtaining_ip">"Ottenimento indirizzo IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
+    <string name="fragment_status_obtaining_ip">"Acquisizione indirizzo IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_connected">"Connesso a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="fragment_status_disconnecting">"Disconnessione da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</string>
     <string name="fragment_status_disconnected">"Disconnesso"</string>
@@ -328,13 +328,13 @@
     <string name="status_scanning">"Ricerca..."</string>
     <string name="status_connecting">"Connessione..."</string>
     <string name="status_authenticating">"Autenticazione..."</string>
-    <string name="status_obtaining_ip">"Ottenimento indirizzo..."</string>
-    <string name="status_connected">"Connessa"</string>
+    <string name="status_obtaining_ip">"Acquisizione indirizzo..."</string>
+    <string name="status_connected">"Connesso"</string>
     <string name="status_disconnecting">"Disconnessione..."</string>
     <string name="status_disconnected">"Disconnesso"</string>
     <string name="status_failed">"Non riuscita"</string>
-    <string name="sound_and_display_settings">"Toni e display"</string>
-    <string name="sound_settings">"Impostazioni toni"</string>
+    <string name="sound_and_display_settings">"Audio e display"</string>
+    <string name="sound_settings">"Impostazioni audio"</string>
     <string name="sound_and_display_settings_summary">"Imposta suonerie, notifiche e luminosità dello schermo"</string>
     <string name="silent_mode_title">"Modalità silenziosa"</string>
     <string name="silent_mode_summary">"Tutti i suoni eccetto quelli multimediali verranno disattivati"</string>
@@ -350,7 +350,7 @@
     <string name="notification_volume_title">"Volume notifiche"</string>
     <string name="checkbox_notification_same_as_incoming_call">"Usa volume chiamate in entrata per le notifiche"</string>
     <string name="notification_sound_dialog_title">"Seleziona suoneria notifica"</string>
-    <string name="media_volume_title">"Volume media"</string>
+    <string name="media_volume_title">"Volume app. multimediali"</string>
     <string name="media_volume_summary">"Imposta il volume di musica e video"</string>
     <string name="dtmf_tone_enable_title">"Toni udibili al tocco"</string>
     <string name="dtmf_tone_enable_summary_on">"Riproduci toni durante la composizione"</string>
@@ -360,7 +360,7 @@
     <string name="sound_effects_enable_summary_off">"Riproduci toni durante una selezione sullo schermo"</string>
     <string name="play_media_notification_sounds_enable_title">"Notifiche scheda SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on">"Disattiva i suoni di notifica della scheda SD"</string>
-    <string name="play_media_notification_sounds_enable_summary_off">"Attiva\ni suoni di notifica della scheda SD"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Attiva suoni di notifica della scheda SD"</string>
     <string name="sync_settings">"Sincronizzazione dati"</string>
     <string name="sync_settings_summary">"Seleziona le applicazioni da sincronizzare"</string>
     <string name="display_settings">"Impostazioni display"</string>
@@ -372,7 +372,7 @@
     <string name="screen_timeout">"Timeout schermo"</string>
     <string name="screen_timeout_summary">"Regola il tempo che deve trascorrere prima che lo schermo si spenga automaticamente"</string>
     <string name="sim_lock_settings">"Impostazioni blocco SIM"</string>
-    <string name="sim_lock_settings_category">"Configurazione blocco SIM"</string>
+    <string name="sim_lock_settings_category">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_title">"Blocco della SIM"</string>
     <string name="sim_pin_toggle">"Blocca SIM"</string>
     <string name="sim_lock_on">"Richiedi il PIN per l\'uso del telefono"</string>
@@ -393,7 +393,7 @@
     <string name="sim_enter_ok">"OK"</string>
     <string name="sim_enter_cancel">"Annulla"</string>
     <string name="device_info_settings">"Stato telefono"</string>
-    <string name="system_update_settings_list_item_title">"Aggiornamenti di sistema"</string>
+    <string name="system_update_settings_list_item_title">"Aggiornamenti sistema"</string>
     <string name="system_update_settings_list_item_summary">"Verifica aggiornamenti di sistema"</string>
     <string name="firmware_version">"Versione firmware"</string>
     <string name="model_number">"Numero modello"</string>
@@ -403,9 +403,9 @@
     <string name="device_info_not_available">"Non disponibile"</string>
     <string name="device_status_activity_title">"Stato"</string>
     <string name="device_status">"Stato"</string>
-    <string name="device_status_summary">"IMEI, numero di telefono, segnale etc."</string>
-    <string name="storage_settings_title">"Scheda SD e memoria telefono"</string>
-    <string name="storage_settings_summary">"Smonta la scheda SD, visualizza lo spazio di archiviazione disponibile"</string>
+    <string name="device_status_summary">"IMEI, numero di telefono, segnale ecc."</string>
+    <string name="storage_settings_title">"Scheda SD e memoria"</string>
+    <string name="storage_settings_summary">"Smonta la scheda SD, visualizza spazio di archiviazione disponibile"</string>
     <string name="status_number">"Numero di telefono"</string>
     <string name="status_network_type">"Tipo di rete cellulare"</string>
     <string name="status_data_state">"Stato rete cellulare"</string>
@@ -429,7 +429,7 @@
     <string name="sd_format">"Formatta scheda SD"</string>
     <string name="sd_format_summary">"Formatta (cancella) la scheda SD"</string>
     <string name="sd_unavailable">"Non disponibile"</string>
-    <string name="read_only">"(Sola lettura)"</string>
+    <string name="read_only">" (Sola lettura)"</string>
     <string name="battery_status_title">"Stato batteria"</string>
     <string name="battery_level_title">"Livello batteria"</string>
     <string name="apn_settings">"APN"</string>
@@ -480,7 +480,7 @@
     <string name="network_settings_summary">"Imposta le opzioni per roaming, reti e APN"</string>
     <string name="location_title">"Fonti localizzazione personali"</string>
     <string name="location_network_based">"Usa reti wireless"</string>
-    <string name="location_networks_disabled">"Visualizza la posizione nelle applicazioni (ad esempio Mappe) utilizzando le reti wireless"</string>
+    <string name="location_networks_disabled">"Visualizza la posizione nelle applicazioni (ad esempio Maps) utilizzando le reti wireless"</string>
     <string name="location_neighborhood_level">"Posizione determinata dalle reti mobili e/o Wi-Fi"</string>
     <string name="location_gps">"Attiva satelliti GPS"</string>
     <string name="location_street_level">"Durante localizzazione, accuratezza a livello stradale (deselezionare per risparmiare batteria)"</string>
@@ -515,7 +515,7 @@
     <string name="lockpattern_settings_enable_summary">"Devi inserire la sequenza per sbloccare lo schermo"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"Usa sequenza visibile"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title">"Usa reazione tattile"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Imposta sequenza di sblocco"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Imposta sequenza"</string>
     <string name="lockpattern_settings_change_lock_pattern">"Cambia sequenza di sblocco"</string>
     <string name="lockpattern_settings_help_how_to_record">"Procedura per l\'impostazione di una sequenza di sblocco"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Troppi tentativi errati."</string>
@@ -529,7 +529,7 @@
     <string name="manageapplications_settings_title">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary">"Gestisci e rimuovi applicazioni installate"</string>
     <string name="applications_settings">"Applicazioni"</string>
-    <string name="applications_settings_summary">"Gestisci le applicazioni, imposta i collegamenti di avvio rapido"</string>
+    <string name="applications_settings_summary">"Gestisci le applicazioni, imposta le scorciatoie di avvio rapido"</string>
     <string name="applications_settings_header">"Impostazioni applicazione"</string>
     <string name="install_applications">"Origini sconosciute"</string>
     <string name="install_unknown_applications">"Consenti l\'installazione di applicazioni non commerciali"</string>
@@ -542,7 +542,7 @@
     <string name="clear_cache_btn_text">"Cancella cache"</string>
     <string name="cache_size_label">"Cache"</string>
     <string name="controls_label">"Controlli"</string>
-    <string name="force_stop">"Forza interruzione"</string>
+    <string name="force_stop">"Termina"</string>
     <string name="total_size_label">"Totale"</string>
     <string name="application_size_label">"Applicazione"</string>
     <string name="data_size_label">"Dati"</string>
@@ -569,15 +569,15 @@
     <string name="app_not_found_dlg_title">"Applicazione non trovata"</string>
     <string name="app_not_found_dlg_text">"Impossibile trovare l\'applicazione \nnell\'elenco di applicazioni installate."</string>
     <string name="clear_data_failed">"Impossibile cancellare i dati dell\'applicazione."</string>
-    <string name="security_settings_desc">"Contenuto a cui può accedere l\'applicazione sul telefono:"</string>
+    <string name="security_settings_desc">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
     <string name="computing_size">"Elaborazione..."</string>
     <string name="invalid_size_value">"Impossibile stabilire le dimensioni del pacchetto"</string>
     <string name="empty_list_msg">"Nessuna applicazione di terze parti installata."</string>
-    <string name="language_settings">"Impostazioni internazionali e testo"</string>
-    <string name="language_settings_summary">"Imposta opzioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
-    <string name="language_category">"Impostazione locale"</string>
+    <string name="language_settings">"Lingua e testo"</string>
+    <string name="language_settings_summary">"Impostazioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
+    <string name="language_category">"Impostazioni lingua"</string>
     <string name="text_category">"Impostazioni testo"</string>
-    <string name="phone_language">"Seleziona impost. internaz."</string>
+    <string name="phone_language">"Seleziona lingua"</string>
     <string name="phone_language_summary">"Seleziona lingua e regione"</string>
     <string name="auto_replace">"Sostituzione automatica"</string>
     <string name="auto_replace_summary">"Corregge le parole con errori di ortografia"</string>
@@ -601,17 +601,17 @@
     <string name="testing_battery_info">"Informazioni batteria"</string>
     <string name="testing_battery_history">"Cronologia batteria"</string>
     <string name="quick_launch_title">"Avvio rapido"</string>
-    <string name="quick_launch_summary">"Imposta tasti di scelta rapida per avviare le applicazioni"</string>
+    <string name="quick_launch_summary">"Imposta scorciatoie da tastiera per avviare le applicazioni"</string>
     <string name="quick_launch_assign_application">"Assegna applicazione"</string>
-    <string name="quick_launch_no_shortcut">"Nessun collegamento"</string>
+    <string name="quick_launch_no_shortcut">"Nessuna scorciatoia"</string>
     <string name="quick_launch_shortcut">"Cerca + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title">"Cancella"</string>
-    <string name="quick_launch_clear_dialog_message">"Il collegamento per <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) verrà cancellato."</string>
+    <string name="quick_launch_clear_dialog_message">"La scorciatoia per <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) verrà cancellata."</string>
     <string name="quick_launch_clear_ok_button">"OK"</string>
     <string name="quick_launch_clear_cancel_button">"Annulla"</string>
     <string name="quick_launch_display_mode_applications">"Applicazioni"</string>
-    <string name="quick_launch_display_mode_shortcuts">"Collegamenti"</string>
-    <string name="input_methods_settings_title">"Inserim. testo"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Scorciatoie"</string>
+    <string name="input_methods_settings_title">"Inserimento testo"</string>
     <string name="input_methods_settings_summary">"Gestisci opzioni inserimento testo"</string>
     <string name="input_methods_settings_label_format">"Impostazioni %s"</string>
     <string name="development_settings_title">"Sviluppo"</string>
@@ -619,10 +619,13 @@
     <string name="enable_adb">"Debug USB"</string>
     <string name="enable_adb_summary">"Modalità debug quando è connesso USB"</string>
     <string name="keep_screen_on">"Rimani attivo"</string>
-    <string name="keep_screen_on_summary">"Lo schermo non diventa mai inattivo sotto carica"</string>
-    <string name="allow_mock_location">"Consenti posizioni fittizie"</string>
+    <string name="keep_screen_on_summary">"Lo schermo non va mai in stand-by se sotto carica"</string>
+    <string name="allow_mock_location">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary">"Consenti posizioni fittizie"</string>
-    <string name="gadget_picker_title">"Scegli gadget"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Dettagli per UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Dettagli di utilizzo della rete per <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +644,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Pacchetti che condividono questo UID:"</string>
     <string name="battery_history_no_data">"Dati sull\'utilizzo della batteria non disponibili"</string>
     <string name="battery_history_sensor">"Sensore:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Sensore usato dai pacchetti:"</string>
     <string name="battery_history_sensor_usage">"Usato <xliff:g id="COUNT">%1$d</xliff:g> volte da <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Usato <xliff:g id="COUNT">%1$d</xliff:g> volte da uno di:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Tempo trascorso con schermo acceso:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"A batteria:"</string>
     <string name="battery_history_screen_on_plugged">"Collegato:"</string>
     <string name="usage_stats_label">"Statistiche di utilizzo"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 4f7d8d5..d73a3d7 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -55,18 +55,15 @@
     <item>"電源接続時はスリープしない"</item>
     <item>"スリープしない"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU使用状況"</item>
-    <item>"ネットワーク使用状況"</item>
-    <item>"センサー使用状況"</item>
-    <item>"画面をONにした時刻"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"デバイスリセットからの経過時間"</item>
-    <item>"前回起動時より前"</item>
-    <item>"起動時からの経過時間"</item>
-    <item>"バッテリ使用開始からの経過時間"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"使用時間"</item>
     <item>"起動回数"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bc481c2..f1c2414 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"切断"</string>
     <string name="bluetooth_disconnecting">"切断中..."</string>
     <string name="bluetooth_connecting">"接続中..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"この端末をペアに設定する"</string>
     <string name="bluetooth_pairing">"ペアとして設定中..."</string>
-    <string name="bluetooth_paired">"ペア設定。切断。"</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"ハンズフリー/ヘッドセット"</string>
     <string name="progress_scanning">"スキャン中"</string>
     <string name="bluetooth_notif_ticker">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title">"ペア設定リクエスト"</string>
-    <string name="bluetooth_notif_message">"ペアとして設定"</string>
+    <string name="bluetooth_notif_message">"ペアとして設定 "</string>
     <string name="date_and_time">"日付形式"</string>
     <string name="date_time_12_hour_sample">"1:00 PM"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"タイムゾーンの選択"</string>
     <string name="display_preview_label">"プレビュー:"</string>
     <string name="display_font_size_label">"フォントサイズ:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g>を送信"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"SDカードをフォーマット"</string>
     <string name="sd_format_summary">"SDカードをフォーマット（消去）"</string>
     <string name="sd_unavailable">"使用不可"</string>
-    <string name="read_only">"（読み取り専用）"</string>
+    <string name="read_only">" （読み取り専用）"</string>
     <string name="battery_status_title">"電池の状態:"</string>
     <string name="battery_level_title">"電池残量"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary">"擬似ロケーションを許可"</string>
-    <string name="gadget_picker_title">"ガジェットを選択"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"UID %dの詳細"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g>のネットワーク使用状況の詳細:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"このUIDを共有するパッケージ:"</string>
     <string name="battery_history_no_data">"バッテリ使用状況のデータは利用できません"</string>
     <string name="battery_history_sensor">"センサー:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"パッケージで使用されるセンサー:"</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g>により<xliff:g id="COUNT">%1$d</xliff:g>回使用"</string>
     <string name="battery_history_sensor_usage_multi">"次のいずれかにより<xliff:g id="COUNT">%1$d</xliff:g>回使用:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"画面をONで使用した時間:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"バッテリ使用開始:"</string>
     <string name="battery_history_screen_on_plugged">"電源に接続:"</string>
     <string name="usage_stats_label">"使用統計情報"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 2399e9d..ac1c6e1 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -55,18 +55,15 @@
     <item>"전원에 연결되었을 때는 절전 모드로 전환되지 않음"</item>
     <item>"전환 안 됨"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU 사용"</item>
-    <item>"네트워크 사용"</item>
-    <item>"센서 사용"</item>
-    <item>"화면 켜짐 시간"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"기기 재설정 이후"</item>
-    <item>"마지막 부팅 이전"</item>
-    <item>"마지막 부팅 이후"</item>
-    <item>"마지막 분리 이후"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"사용 시간"</item>
     <item>"계수 시작"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 99e9657..7d7590f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"연결끊김"</string>
     <string name="bluetooth_disconnecting">"연결을 끊는 중..."</string>
     <string name="bluetooth_connecting">"연결 중..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"이 장치와 페어링"</string>
     <string name="bluetooth_pairing">"페어링 중..."</string>
-    <string name="bluetooth_paired">"페어링됨. 연결끊김."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"핸즈프리/헤드셋"</string>
     <string name="progress_scanning">"검색 중"</string>
     <string name="bluetooth_notif_ticker">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_notif_title">"페어링 요청"</string>
-    <string name="bluetooth_notif_message">"페어링하려면 선택합니다."</string>
+    <string name="bluetooth_notif_message">"페어링하려면 선택합니다. "</string>
     <string name="date_and_time">"날짜 및 시간 설정"</string>
     <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"표준시간대 선택"</string>
     <string name="display_preview_label">"미리보기:"</string>
     <string name="display_font_size_label">"글꼴 크기:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> 보내기"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"SD 카드 포맷"</string>
     <string name="sd_format_summary">"SD 카드 포맷(지우기)"</string>
     <string name="sd_unavailable">"사용할 수 없음"</string>
-    <string name="read_only">"(읽기전용)"</string>
+    <string name="read_only">" (읽기전용)"</string>
     <string name="battery_status_title">"배터리 상태"</string>
     <string name="battery_level_title">"배터리 수준"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="allow_mock_location">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary">"모의 위치 허용"</string>
-    <string name="gadget_picker_title">"가젯 선택"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"UID %d의 세부정보"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g>의 네트워크 사용 세부정보"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"이 UID를 공유하는 패키지"</string>
     <string name="battery_history_no_data">"배터리 사용 데이터가 없습니다."</string>
     <string name="battery_history_sensor">"센서:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"패키지가 사용한 센서:"</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g>에서 <xliff:g id="COUNT">%1$d</xliff:g>번 사용"</string>
     <string name="battery_history_sensor_usage_multi">"다음 중 하나가 <xliff:g id="COUNT">%1$d</xliff:g>번 사용:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"화면을 켠 상태에서 소비한 시간:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"배터리 켜짐 시간:"</string>
     <string name="battery_history_screen_on_plugged">"연결됨:"</string>
     <string name="usage_stats_label">"사용 통계"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 112b38b..e219452 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -53,14 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
-    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
-    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
-    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
-    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
-    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
-    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
-    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
-    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
     <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
     <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
     <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b8da111..f111758 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -94,23 +94,23 @@
     <string name="bluetooth_disconnected">"Frakoblet"</string>
     <string name="bluetooth_disconnecting">"Kobler fra…"</string>
     <string name="bluetooth_connecting">"Kobler til…"</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Par med denne enheten"</string>
     <string name="bluetooth_pairing">"Parer…"</string>
-    <string name="bluetooth_paired">"Paret. Frakoblet."</string>
+    <string name="bluetooth_paired">"Paret"</string>
     <string name="bluetooth_device">"handsfree/håndsett"</string>
     <string name="progress_scanning">"Søker"</string>
     <string name="bluetooth_notif_ticker">"Paringsforespørsel for Bluetooth"</string>
     <string name="bluetooth_notif_title">"Paringsforespørsel"</string>
-    <string name="bluetooth_notif_message">"Velg å pare med"</string>
+    <string name="bluetooth_notif_message">"Velg å pare med "</string>
     <string name="date_and_time">"Innstillinger for dato og tid"</string>
     <string name="date_time_12_hour_sample">"1:00 pm"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Velg tidssone"</string>
     <string name="display_preview_label">"Forhåndsvisning:"</string>
     <string name="display_font_size_label">"Skriftstørrelse:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Send <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +429,7 @@
     <string name="sd_format">"Formater minnekort"</string>
     <string name="sd_format_summary">"Formater (fjern alt fra) minnekortet"</string>
     <string name="sd_unavailable">"Ikke tilgjengelig"</string>
-    <string name="read_only">"(skrivebeskyttet)"</string>
+    <string name="read_only">" (skrivebeskyttet)"</string>
     <string name="battery_status_title">"Batteristatus"</string>
     <string name="battery_level_title">"Batterinivå"</string>
     <string name="apn_settings">"APN"</string>
@@ -623,6 +623,8 @@
     <string name="allow_mock_location">"Tillat manuell plassering"</string>
     <string name="allow_mock_location_summary">"Tillat manuell plassering"</string>
     <string name="gadget_picker_title">"Velg gadget"</string>
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Detaljer for UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Nettbruk av <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +643,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Pakker som deler denne UID-en:"</string>
     <string name="battery_history_no_data">"Ingen batterihistorikk tilgjengelig"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Sensor brukt av pakker:"</string>
     <string name="battery_history_sensor_usage">"Brukt <xliff:g id="COUNT">%1$d</xliff:g> ganger av <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Brukt <xliff:g id="COUNT">%1$d</xliff:g> ganger av en av:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Tid brukt med skjermen på:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"På batteri:"</string>
     <string name="battery_history_screen_on_plugged">"På nettstrøm:"</string>
     <string name="usage_stats_label">"Bruksstatistikk"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 430aab0..51a48b0 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Nooit indien aangesloten"</item>
     <item>"Nooit"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU-gebruik"</item>
-    <item>"Netwerkgebruik"</item>
-    <item>"Sensorgebruik"</item>
-    <item>"Tijd scherm \'aan\'"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Sinds opnieuw instellen van apparaat"</item>
-    <item>"Voor laatste opstartactie"</item>
-    <item>"Sinds laatste opstartactie"</item>
-    <item>"Sinds laatste keer losgekoppeld"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Gebruikstijd"</item>
     <item>"Aantal keer gestart"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1eb22d3..6f30611 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"Verbinding verbroken"</string>
     <string name="bluetooth_disconnecting">"Verbinding verbreken..."</string>
     <string name="bluetooth_connecting">"Verbinding maken..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Koppelen met dit apparaat"</string>
     <string name="bluetooth_pairing">"Koppelen..."</string>
-    <string name="bluetooth_paired">"Gekoppeld. Verbinding verbroken."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"handsfree/headset"</string>
     <string name="progress_scanning">"Scannen"</string>
     <string name="bluetooth_notif_ticker">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title">"Koppelingsverzoek"</string>
-    <string name="bluetooth_notif_message">"Selecteer dit om te koppelen met"</string>
+    <string name="bluetooth_notif_message">"Selecteer dit om te koppelen met "</string>
     <string name="date_and_time">"Datum- en tijdinstellingen"</string>
     <string name="date_time_12_hour_sample">"13:00 uur"</string>
-    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="date_time_24_hour_sample">"01:00:00 PM"</string>
     <string name="choose_timezone">"Tijdzone selecteren"</string>
     <string name="display_preview_label">"Voorbeeld:"</string>
     <string name="display_font_size_label">"Lettergrootte:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> verzenden"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -207,7 +208,7 @@
     <string name="zone_list_menu_sort_alphabetically">"Alfabetisch sorteren"</string>
     <string name="zone_list_menu_sort_by_timezone">"Sorteren op tijdzone"</string>
     <string name="security_settings_title">"Beveiliging en locatie"</string>
-    <string name="security_settings_summary">"\'Mijn locatie\' instellen, scherm deblokkeren en SIM-kaart blokkeren"</string>
+    <string name="security_settings_summary">"Mijn locatie\' instellen, scherm ontgrendelen en SIM-kaart blokkeren"</string>
     <string name="security_passwords_title">"Wachtwoorden"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Bluetooth inschakelen"</string>
@@ -306,7 +307,7 @@
     <string name="wifi_gateway">"Gateway"</string>
     <string name="wifi_netmask">"Netmasker"</string>
     <string name="wifi_context_menu_connect">"Verbinding maken met netwerk"</string>
-    <string name="wifi_context_menu_forget">"Netwerk vergeten"</string>
+    <string name="wifi_context_menu_forget">"Netwerk niet gebruiken"</string>
     <string name="wifi_context_menu_change_password">"Wachtwoord wijzigen"</string>
     <string name="wifi_advanced_titlebar">"Geavanceerd"</string>
     <string name="wifi_setting_num_channels_title">"Regulerend domein"</string>
@@ -380,7 +381,7 @@
     <string name="sim_pin_change">"SIM PIN-code wijzigen"</string>
     <string name="sim_enter_pin">"SIM PIN-code"</string>
     <string name="sim_enable_sim_lock">"SIM-kaart blokkeren"</string>
-    <string name="sim_disable_sim_lock">"SIM-kaart deblokkeren"</string>
+    <string name="sim_disable_sim_lock">"SIM-kaart ontgrendelen"</string>
     <string name="sim_enter_old">"Oude SIM PIN-code"</string>
     <string name="sim_enter_new">"Nieuwe SIM PIN-code"</string>
     <string name="sim_reenter_new">"Nieuwe PIN-code nogmaals invoeren"</string>
@@ -405,7 +406,7 @@
     <string name="device_status">"Status"</string>
     <string name="device_status_summary">"IMEI-nummer, telefoonnummer, signaal, enzovoort"</string>
     <string name="storage_settings_title">"SD-kaart en telefoongeheugen"</string>
-    <string name="storage_settings_summary">"SD-kaart ontkoppelen, beschikbar opslagruimte weergeven"</string>
+    <string name="storage_settings_summary">"SD-kaart ontkoppelen, beschikbare opslagruimte weergeven"</string>
     <string name="status_number">"Telefoonnummer"</string>
     <string name="status_network_type">"Type mobiel netwerk"</string>
     <string name="status_data_state">"Status mobiel netwerk"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"SD-kaart formatteren"</string>
     <string name="sd_format_summary">"De SD-kaart formatteren (wissen)"</string>
     <string name="sd_unavailable">"Niet beschikbaar"</string>
-    <string name="read_only">"(Alleen-lezen)"</string>
+    <string name="read_only">" (Alleen-lezen)"</string>
     <string name="battery_status_title">"Accustatus"</string>
     <string name="battery_level_title">"Accuniveau"</string>
     <string name="apn_settings">"APN\'s"</string>
@@ -463,8 +464,8 @@
     <string name="master_clear_button_text">"Telefoon opnieuw instellen"</string>
     <string name="master_clear_final_desc">"Telefoon opnieuw instellen en alle gegevens en toepassingen wissen? Actie kan niet ongedaan worden gemaakt!"</string>
     <string name="master_clear_final_button_text">"Alles wissen"</string>
-    <string name="master_clear_gesture_prompt">"Teken uw deblokkeringspatroon"</string>
-    <string name="master_clear_gesture_explanation">"U moet uw deblokkeringspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
+    <string name="master_clear_gesture_prompt">"Teken uw ontgrendelingspatroon"</string>
+    <string name="master_clear_gesture_explanation">"U moet uw ontgrendelingspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
     <string name="master_clear_failed">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
     <string name="media_format_title">"SD-kaart formatteren."</string>
     <string name="media_format_summary">"Hiermee worden alle gegevens op de SD-kaart gewist"</string>
@@ -495,35 +496,35 @@
     <string name="settings_license_activity_title">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading">"Laden..."</string>
-    <string name="lock_settings_title">"Deblokkeringspatroon scherm"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Deblokkeringspatroon wijzigen"</string>
+    <string name="lock_settings_title">"Ontgrendelingspatroon scherm"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Ontgrendelingspatroon wijzigen"</string>
     <string name="lockpattern_need_to_unlock">"Opgeslagen patroon bevestigen"</string>
     <string name="lockpattern_need_to_unlock_wrong">"Probeer het opnieuw:"</string>
-    <string name="lockpattern_recording_intro_header">"Teken een deblokkeringspatroon"</string>
+    <string name="lockpattern_recording_intro_header">"Teken een ontgrendelingspatroon"</string>
     <string name="lockpattern_recording_intro_footer">"Druk op \'Menu\' voor hulp."</string>
     <string name="lockpattern_recording_inprogress">"Haal uw vinger van het scherm als u klaar bent."</string>
     <string name="lockpattern_recording_incorrect_too_short">"Verbind minimaal <xliff:g id="NUMBER">%d</xliff:g> punten. Probeer het opnieuw:"</string>
     <string name="lockpattern_pattern_entered_header">"Patroon opgenomen!"</string>
     <string name="lockpattern_need_to_confirm">"Teken patroon nogmaals ter bevestiging:"</string>
-    <string name="lockpattern_pattern_confirmed_header">"Uw nieuwe deblokkeringspatroon:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Uw nieuwe ontgrendelingspatroon:"</string>
     <string name="lockpattern_confirm_button_text">"Bevestigen"</string>
     <string name="lockpattern_restart_button_text">"Opnieuw tekenen"</string>
     <string name="lockpattern_retry_button_text">"Opnieuw proberen"</string>
     <string name="lockpattern_continue_button_text">"Doorgaan"</string>
     <string name="lockpattern_settings_title">"Deblokkeringspatroon"</string>
     <string name="lockpattern_settings_enable_title">"Patroon vereist"</string>
-    <string name="lockpattern_settings_enable_summary">"U moet een patroon tekenen om het scherm te deblokkeren"</string>
+    <string name="lockpattern_settings_enable_summary">"U moet een patroon tekenen om het scherm te ontgrendelen"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title">"Zichtbaar patroon gebruiken"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title">"Tastbare feedback gebruiken"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Deblokkeringspatroon instellen"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Deblokkeringspatroon wijzigen"</string>
-    <string name="lockpattern_settings_help_how_to_record">"U tekent als volgt een deblokkeringspatroon"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Ontgrendelingspatroon instellen"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Ontgrendelingspatroon wijzigen"</string>
+    <string name="lockpattern_settings_help_how_to_record">"U tekent als volgt een ontgrendelingspatroon"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Te veel onjuiste pogingen!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
     <string name="skip_button_label">"Annuleren"</string>
     <string name="next_button_label">"Volgende"</string>
     <string name="lock_title">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermdeblokkeringspatroon. "\n<font height="17">\n</font><b>"1"</b>"  Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>"  Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
+    <string name="lock_intro_message"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermontgrendelingspatroon. "\n<font height="17">\n</font><b>"1"</b>"  Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>"  Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
     <string name="lock_example_title">"Voorbeeldpatroon"</string>
     <string name="lock_example_message">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
     <string name="manageapplications_settings_title">"Toepassingen beheren"</string>
@@ -542,7 +543,7 @@
     <string name="clear_cache_btn_text">"Cache wissen"</string>
     <string name="cache_size_label">"Cachegeheugen"</string>
     <string name="controls_label">"Bedieningselementen"</string>
-    <string name="force_stop">"Gedwongen stoppen"</string>
+    <string name="force_stop">"Nu stoppen"</string>
     <string name="total_size_label">"Totaal"</string>
     <string name="application_size_label">"Toepassing"</string>
     <string name="data_size_label">"Gegevens"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="allow_mock_location">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary">"Neplocaties toestaan"</string>
-    <string name="gadget_picker_title">"Gadget kiezen"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Details voor UID %d"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Netwerkgebruiksdetails voor <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Pakketten die deze UID delen:"</string>
     <string name="battery_history_no_data">"Er zijn geen beschikbare gebruiksgegevens van de accu"</string>
     <string name="battery_history_sensor">"Sensor:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"De sensor wordt gebruikt door de volgende pakketten:"</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="COUNT">%1$d</xliff:g> keer gebruikt door <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"<xliff:g id="COUNT">%1$d</xliff:g> keer gebruikt door een van de volgende:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Tijd verstreken met scherm aan:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"Op accu:"</string>
     <string name="battery_history_screen_on_plugged">"Opladen:"</string>
     <string name="usage_stats_label">"Gebruiksstatistieken"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 6842558..5855618 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -27,7 +27,7 @@
   <string-array name="screen_timeout_entries">
     <item>"15 sekund"</item>
     <item>"30 sekund"</item>
-    <item>"minuta"</item>
+    <item>"1 minuta"</item>
     <item>"2 minuty"</item>
     <item>"10 minut"</item>
     <item>"Nigdy nie wygaszaj"</item>
@@ -55,18 +55,15 @@
     <item>"Nigdy, gdy podłączony"</item>
     <item>"Nigdy"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Wykorzystanie procesora"</item>
-    <item>"Wykorzystanie sieci"</item>
-    <item>"Użycie czujnika"</item>
-    <item>"Czas włączenia ekranu"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"Od ponownego uruchomienia urządzenia"</item>
-    <item>"Przed ostatnim uruchomieniem"</item>
-    <item>"Od ostatniego uruchomienia"</item>
-    <item>"Od ostatniego odłączenia"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Czas użycia"</item>
     <item>"Licznik uruchomień"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a70a676..51ce9cb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,14 +21,14 @@
     <string name="turn_on_qxdm">"Włącz dziennik QXDM dla karty SD"</string>
     <string name="turn_off_qxdm">"Wyłącz dziennik QXDM dla karty SD"</string>
     <string name="radioInfo_menu_viewADN">"Wyświetl książkę adresową na karcie SIM"</string>
-    <string name="radioInfo_menu_viewFDN">"Wyświetl numery wybierania ustalonego (FDN)"</string>
+    <string name="radioInfo_menu_viewFDN">"Wyświetl ustalone numery (FDN)"</string>
     <string name="radioInfo_menu_viewSDN">"Wyświetl numery usług"</string>
     <string name="radioInfo_menu_getPDP">"Pobierz listę PDP"</string>
     <string name="radioInfo_menu_enableData">"Włącz połączenie danych"</string>
     <string name="radioInfo_menu_disableData">"Wyłącz połączenie danych"</string>
     <string name="radioInfo_menu_enableDataOnBoot">"Włącz dane podczas uruchamianiu"</string>
     <string name="radioInfo_menu_disableDataOnBoot">"Wyłącz dane przy uruchamianiu"</string>
-    <string name="radioInfo_service_in">"W naprawie"</string>
+    <string name="radioInfo_service_in">"Działa"</string>
     <string name="radioInfo_service_out">"Nie działa"</string>
     <string name="radioInfo_service_emergency">"Tylko połączenia alarmowe"</string>
     <string name="radioInfo_service_off">"Radio wyłączone"</string>
@@ -82,10 +82,10 @@
     <string name="battery_info_health_over_voltage">"Przepięcie"</string>
     <string name="battery_info_health_unspecified_failure">"Nieznany błąd"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_visibility">"Możliwe do wykrycia"</string>
-    <string name="bluetooth_is_discoverable">"Możliwe do wykrycia przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekund..."</string>
+    <string name="bluetooth_visibility">"Wykrywalny"</string>
+    <string name="bluetooth_is_discoverable">"Wykrywalny przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s …"</string>
     <string name="bluetooth_not_discoverable">"Zezwalaj na wykrywanie urządzenia"</string>
-    <string name="bluetooth_devices">"Urządzenia Bluetooth"</string>
+    <string name="bluetooth_devices">"Lista urządzeń"</string>
     <string name="bluetooth_device_name">"Nazwa urządzenia"</string>
     <string name="bluetooth_name_not_set">"Nie ustawiono nazwy, wykorzystywana jest nazwa konta"</string>
     <string name="bluetooth_scan_for_devices">"Wyszukaj urządzenia"</string>
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"Rozłączona"</string>
     <string name="bluetooth_disconnecting">"Rozłączanie..."</string>
     <string name="bluetooth_connecting">"Łączenie..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Paruj z tym urządzeniem"</string>
     <string name="bluetooth_pairing">"Parowanie..."</string>
-    <string name="bluetooth_paired">"Sparowane. Rozłączona."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"zestaw głośnomówiący/słuchawkowy"</string>
     <string name="progress_scanning">"Przeszukiwanie"</string>
     <string name="bluetooth_notif_ticker">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title">"Żądanie parowania"</string>
-    <string name="bluetooth_notif_message">"Zaznacz, aby sparować"</string>
+    <string name="bluetooth_notif_message">"Zaznacz, aby sparować "</string>
     <string name="date_and_time">"Ustawienia daty i czasu"</string>
     <string name="date_time_12_hour_sample">"1:00 (po południu)"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Wybierz strefę czasową"</string>
     <string name="display_preview_label">"Podgląd:"</string>
     <string name="display_font_size_label">"Rozmiar czcionki:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Wyślij <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -134,7 +135,7 @@
     <string name="radio_info_gprs_service_label">"Usługa GPRS:"</string>
     <string name="radio_info_roaming_label">"Roaming:"</string>
     <string name="radio_info_imei_label">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label">"Przekierowanie połączenia:"</string>
+    <string name="radio_info_call_redirect_label">"Przekierowania połączeń:"</string>
     <string name="radio_info_ppp_resets_label">"Liczba operacji resetowania PPP od momentu uruchomienia:"</string>
     <string name="radio_info_gsm_disconnects_label">"GSM rozłącza się:"</string>
     <string name="radio_info_current_network_label">"Obecna sieć:"</string>
@@ -174,11 +175,11 @@
     <string name="sdcard_settings_bad_removal_status">"Karta SD została usunięta, gdy była używana!"</string>
     <string name="sdcard_settings_used_bytes_label">"Wykorzystanych bajtów:"</string>
     <string name="sdcard_settings_scanning_status">"Przeszukiwanie karty SD w poszukiwaniu multimediów..."</string>
-    <string name="sdcard_settings_read_only_status">"Karta SD jest zamontowana tylko do odczytu"</string>
+    <string name="sdcard_settings_read_only_status">"Karta SD jest podłączona tylko do odczytu"</string>
     <string name="next_label">"Dalej"</string>
     <string name="language_picker_title">"Ustawienia regionalne"</string>
     <string name="select_your_language">"Wybierz język"</string>
-    <string name="activity_picker_label">"Wybierz działanie"</string>
+    <string name="activity_picker_label">"Wybierz czynność"</string>
     <string name="device_info_label">"Informacje o urządzeniu"</string>
     <string name="battery_info_label">"Informacje o baterii"</string>
     <string name="battery_history_label">"Historia baterii"</string>
@@ -192,22 +193,22 @@
     <string name="airplane_mode_summary">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
     <string name="airplane_mode_turning_on">"Wyłączanie połączeń bezprzewodowych..."</string>
     <string name="airplane_mode_turning_off">"Włączanie połączeń bezprzewodowych..."</string>
-    <string name="radio_controls_title">"Sterowanie bezprzewodowe"</string>
+    <string name="radio_controls_title">"Opcje bezprzewodowe"</string>
     <string name="radio_controls_summary">"Zarządzaj Wi-Fi, Bluetooth, trybem samolotowym i sieciami komórkowymi"</string>
     <string name="date_and_time_settings_title">"Data i czas"</string>
     <string name="date_and_time_settings_summary">"Ustaw format daty, czasu i strefę czasową"</string>
     <string name="date_time_auto">"Automatycznie"</string>
     <string name="date_time_auto_summaryOn">"Skorzystaj z wartości dostarczonych przez sieć"</string>
-    <string name="date_time_auto_summaryOff">"Skorzystaj z wartości dostarczonych przez sieć"</string>
-    <string name="date_time_24hour">"Używaj formatu 24-godzinnego"</string>
+    <string name="date_time_auto_summaryOff">"Skorzystaj z informacji dostarczonych przez operatora"</string>
+    <string name="date_time_24hour">"Format 24-godzinny"</string>
     <string name="date_time_set_time">"Ustaw czas"</string>
     <string name="date_time_set_timezone">"Wybierz strefę czasową"</string>
     <string name="date_time_set_date">"Ustaw datę"</string>
     <string name="date_time_date_format">"Wybierz format daty"</string>
     <string name="zone_list_menu_sort_alphabetically">"Sortuj alfabetycznie"</string>
     <string name="zone_list_menu_sort_by_timezone">"Sortuj według strefy czasowej"</string>
-    <string name="security_settings_title">"Zabezpieczenia i położenie"</string>
-    <string name="security_settings_summary">"Ustaw moją lokalizację, odblokowanie ekranu, blokada karty SIM"</string>
+    <string name="security_settings_title">"Położenie i zabezpieczenia"</string>
+    <string name="security_settings_summary">"Ustaw Moją lokalizację, blokadę ekranu, blokadę karty SIM"</string>
     <string name="security_passwords_title">"Hasła"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Włącz Bluetooth"</string>
@@ -291,7 +292,7 @@
     <string name="wifi_password_unchanged">"(niezmienione)"</string>
     <string name="wifi_add_other_network">"Dodaj sieć Wi-Fi"</string>
     <string name="wifi_notify_open_networks">"Powiadomienie sieciowe"</string>
-    <string name="wifi_notify_open_networks_summary">"Powiadom mnie, gdy będzie dostępna sieć otwarta"</string>
+    <string name="wifi_notify_open_networks_summary">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
     <string name="wifi_password_incorrect_error">"Wprowadzone hasło sieci jest nieprawidłowe. Spróbuj ponownie."</string>
     <string name="wifi_generic_connection_error">"Wystąpił problem podczas łączenia z siecią. Spróbuj ponownie."</string>
     <string name="wifi_menu_advanced">"Zaawansowane"</string>
@@ -299,7 +300,7 @@
     <string name="wifi_ip_settings_menu_save">"Zapisz"</string>
     <string name="wifi_ip_settings_menu_cancel">"Anuluj"</string>
     <string name="wifi_ip_settings_invalid_ip">"Wprowadź poprawny adres IP."</string>
-    <string name="wifi_use_static_ip">"Używaj statycznego adresu IP"</string>
+    <string name="wifi_use_static_ip">"Statyczny adres IP"</string>
     <string name="wifi_ip_address">"Adres IP"</string>
     <string name="wifi_dns1">"DNS 1"</string>
     <string name="wifi_dns2">"DNS 2"</string>
@@ -313,8 +314,8 @@
     <string name="wifi_setting_num_channels_summary">"Wybierz liczbę wykorzystywanych kanałów"</string>
     <string name="wifi_setting_num_channels_error">"Wystąpił problem podczas ustawiania domeny standaryzacyjnej."</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanałów"</string>
-    <string name="wifi_setting_sleep_policy_title">"Zasady usypiania łączności Wi-Fi"</string>
-    <string name="wifi_setting_sleep_policy_summary">"Określ, kiedy przełączyć łączność Wi-Fi na komórkowe połączenie danych"</string>
+    <string name="wifi_setting_sleep_policy_title">"Zasady usypiania Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Określ, kiedy przełączyć Wi-Fi na komórkowe połączenie danych"</string>
     <string name="wifi_setting_sleep_policy_error">"Wystąpił problem podczas ustawiania zasad usypiania."</string>
     <string name="wifi_advanced_mac_address_title">"Adres MAC"</string>
     <string name="fragment_status_scanning">"Przeszukiwanie..."</string>
@@ -344,20 +345,20 @@
     <string name="ring_volume_summary">"Ustaw głośność połączeń przychodzących i powiadomień"</string>
     <string name="vibrate_title">"Wibracje telefonu"</string>
     <string name="vibrate_summary">"Wibracje telefonu przy połączeniach przychodzących"</string>
-    <string name="notification_sound_title">"Dzwonek powiadomienia"</string>
-    <string name="notification_sound_summary">"Ustaw domyślny dzwonek powiadomienia"</string>
+    <string name="notification_sound_title">"Powiadomienia"</string>
+    <string name="notification_sound_summary">"Ustaw domyślny dzwonek dla powiadomień"</string>
     <string name="incoming_call_volume_title">"Głośność połączeń przychodzących"</string>
     <string name="notification_volume_title">"Głośność powiadomienia"</string>
     <string name="checkbox_notification_same_as_incoming_call">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
     <string name="notification_sound_dialog_title">"Wybierz dzwonek powiadomienia"</string>
     <string name="media_volume_title">"Głośność multimediów"</string>
     <string name="media_volume_summary">"Ustaw głośność muzyki oraz filmów wideo"</string>
-    <string name="dtmf_tone_enable_title">"Słyszalne dźwięki przy dotykaniu"</string>
+    <string name="dtmf_tone_enable_title">"Wybieranie numeru"</string>
     <string name="dtmf_tone_enable_summary_on">"Odtwarzaj dźwięki podczas używania panelu wybierania numeru"</string>
-    <string name="dtmf_tone_enable_summary_off">"Odtwarzaj dźwięki podczas używania panelu wybierania numeru"</string>
-    <string name="sound_effects_enable_title">"Dźwięk wybierania"</string>
-    <string name="sound_effects_enable_summary_on">"Odtwarzaj dźwięk podczas wyboru ekranu"</string>
-    <string name="sound_effects_enable_summary_off">"Odtwarzaj dźwięk podczas wyboru ekranu"</string>
+    <string name="dtmf_tone_enable_summary_off">"Odtwarzaj dźwięki podczas wybierania numeru"</string>
+    <string name="sound_effects_enable_title">"Dotyk ekranu"</string>
+    <string name="sound_effects_enable_summary_on">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
+    <string name="sound_effects_enable_summary_off">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
     <string name="play_media_notification_sounds_enable_title">"Powiadomienia karty SD"</string>
     <string name="play_media_notification_sounds_enable_summary_on">"Wyłącz dźwięki powiadomień dla karty SD"</string>
     <string name="play_media_notification_sounds_enable_summary_off">"Włącz dźwięki powiadomień dla karty SD"</string>
@@ -365,14 +366,14 @@
     <string name="sync_settings_summary">"Wybierz, które aplikacje są synchronizowane"</string>
     <string name="display_settings">"Ustawienia wyświetlacza"</string>
     <string name="animations_title">"Animacja"</string>
-    <string name="animations_summary_on">"Pokazuj animację podczas otwierania/zamykania okien"</string>
-    <string name="animations_summary_off">"Pokazuj animację podczas otwierania/zamykania okien"</string>
-    <string name="brightness">"Jasność"</string>
+    <string name="animations_summary_on">"Pokazuj animację podczas otwierania i zamykania okien"</string>
+    <string name="animations_summary_off">"Pokazuj animację podczas otwierania i zamykania okien"</string>
+    <string name="brightness">"Jasność ekranu"</string>
     <string name="brightness_summary">"Dostosuj jasność ekranu"</string>
-    <string name="screen_timeout">"Wygaszenie ekranu"</string>
+    <string name="screen_timeout">"Wygaszanie ekranu"</string>
     <string name="screen_timeout_summary">"Dostosuj opóźnienie automatycznego wyłączenia ekranu"</string>
     <string name="sim_lock_settings">"Ustawienia blokady karty SIM"</string>
-    <string name="sim_lock_settings_category">"Skonfiguruj blokadę karty SIM"</string>
+    <string name="sim_lock_settings_category">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title">"Blokada karty SIM"</string>
     <string name="sim_pin_toggle">"Zablokuj kartę SIM"</string>
     <string name="sim_lock_on">"Aby korzystać z telefonu, należy wprowadzić kod PIN"</string>
@@ -395,17 +396,17 @@
     <string name="device_info_settings">"Stan telefonu"</string>
     <string name="system_update_settings_list_item_title">"Aktualizacje systemowe"</string>
     <string name="system_update_settings_list_item_summary">"Sprawdź aktualizacje systemu"</string>
-    <string name="firmware_version">"Wersja oprogramowania układowego"</string>
+    <string name="firmware_version">"Wersja oprogramowania"</string>
     <string name="model_number">"Numer modelu"</string>
-    <string name="baseband_version">"Wersja pasma podstawowego"</string>
+    <string name="baseband_version">"Pasmo podstawowe"</string>
     <string name="kernel_version">"Wersja jądra"</string>
     <string name="build_number">"Numer wersji"</string>
     <string name="device_info_not_available">"Niedostępna"</string>
-    <string name="device_status_activity_title">"Stan"</string>
-    <string name="device_status">"Stan"</string>
+    <string name="device_status_activity_title">"Informacje o telefonie"</string>
+    <string name="device_status">"Informacje o telefonie"</string>
     <string name="device_status_summary">"IMEI, numer telefonu, sygnał itp."</string>
     <string name="storage_settings_title">"Karta SD i pamięć telefonu"</string>
-    <string name="storage_settings_summary">"Odłącz kartę SD, pokaż dostępną pamięć"</string>
+    <string name="storage_settings_summary">"Odłącz kartę SD, pokaż ilość dostępnej pamięci"</string>
     <string name="status_number">"Numer telefonu"</string>
     <string name="status_network_type">"Typ sieci komórkowej"</string>
     <string name="status_data_state">"Stan sieci komórkowej"</string>
@@ -419,17 +420,17 @@
     <string name="status_network_traffic_stats">"Wykorzystanie sieci"</string>
     <string name="status_network_traffic_summary">"Wysłane: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Odebrane: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
     <string name="status_up_time">"Czas działania"</string>
-    <string name="status_awake_time">"Czas działania w stanie wybudzenia"</string>
+    <string name="status_awake_time">"Czas działania (włączony)"</string>
     <string name="internal_memory">"Pamięć wewnętrzna telefonu"</string>
     <string name="sd_memory">"Karta SD"</string>
     <string name="memory_available">"Dostępne miejsce"</string>
-    <string name="memory_size">"Łączny rozmiar"</string>
+    <string name="memory_size">"Łączna pojemność"</string>
     <string name="sd_eject">"Odmontuj kartę SD"</string>
     <string name="sd_eject_summary">"Odmontuj kartę SD, aby bezpiecznie ją usunąć"</string>
     <string name="sd_format">"Formatuj kartę SD"</string>
     <string name="sd_format_summary">"Formatuj (wymaż) kartę SD"</string>
     <string name="sd_unavailable">"Niedostępna"</string>
-    <string name="read_only">"(Tylko do odczytu)"</string>
+    <string name="read_only">" (Tylko do odczytu)"</string>
     <string name="battery_status_title">"Stan baterii"</string>
     <string name="battery_level_title">"Poziom naładowania baterii"</string>
     <string name="apn_settings">"Nazwy APN"</string>
@@ -457,9 +458,9 @@
     <string name="error_apn_empty">"Pole APN nie może być puste."</string>
     <string name="error_mcc_not3">"Pole MMC musi zawierać 3 cyfry."</string>
     <string name="error_mnc_not23">"Pole MNC musi zawierać 2 lub 3 cyfry."</string>
-    <string name="master_clear_title">"Przywracanie danych fabrycznych"</string>
+    <string name="master_clear_title">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc">"To działanie spowoduje przywrócenie w telefonie ustawień fabrycznych i wymazanie wszystkich danych oraz pobranych aplikacji!"</string>
+    <string name="master_clear_desc">"Ta czynność spowoduje przywrócenie w telefonie ustawień fabrycznych i wymazanie wszystkich danych oraz pobranych aplikacji!"</string>
     <string name="master_clear_button_text">"Resetuj telefon"</string>
     <string name="master_clear_final_desc">"Zresetować telefon, wymazując wszystkie dane i aplikacje? Działania nie można cofnąć!"</string>
     <string name="master_clear_final_button_text">"Wymaż wszystko"</string>
@@ -475,16 +476,16 @@
     <string name="media_format_gesture_prompt">"Narysuj wzorzec odblokowania"</string>
     <string name="media_format_gesture_explanation">"Aby potwierdzić formatowanie karty SD, należy narysować swój wzorzec do odblokowania."</string>
     <string name="call_settings_title">"Ustawienia połączeń"</string>
-    <string name="call_settings_summary">"Konfiguracja poczty głosowej, przekierowania połączeń, połączeń oczekujących, identyfikatora dzwoniącego"</string>
+    <string name="call_settings_summary">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID dzwoniącego"</string>
     <string name="network_settings_title">"Sieci komórkowe"</string>
     <string name="network_settings_summary">"Ustaw opcje roamingu, sieci, nazw APN"</string>
-    <string name="location_title">"Źródła mojej lokalizacji"</string>
-    <string name="location_network_based">"Skorzystaj z sieci bezprzewodowych"</string>
+    <string name="location_title">"Źródło Mojej lokalizacji"</string>
+    <string name="location_network_based">"Użyj sieci Wi-Fi"</string>
     <string name="location_networks_disabled">"Zobacz położenie w aplikacjach (takich jak Mapy), korzystając z sieci bezprzewodowych"</string>
     <string name="location_neighborhood_level">"Położenie określane jest za pomocą Wi-Fi i/lub sieci komórkowych."</string>
-    <string name="location_gps">"Włącz satelity GPS"</string>
-    <string name="location_street_level">"Podczas ustalania położenia, z dokładnością do ulicy (usuń zaznaczenie, aby oszczędzać baterię)"</string>
-    <string name="location_gps_disabled">"Określ położenie z dokładnością do ulicy (zużywa więcej baterii oraz wymaga czystego widoku nieba)"</string>
+    <string name="location_gps">"Użyj satelit GPS"</string>
+    <string name="location_street_level">"Ustalanie położenia z dokładnością do ulicy (wyłącz, aby oszczędzać baterię)"</string>
+    <string name="location_gps_disabled">"Podaje dokładne położenie (zużywa więcej baterii, działa na zewnątrz)"</string>
     <string name="about_settings">"Informacje o telefonie"</string>
     <string name="about_settings_summary">"Wyświetl informacje prawne, stan telefonu, wersję oprogramowania"</string>
     <string name="legal_information">"Informacje prawne"</string>
@@ -500,7 +501,7 @@
     <string name="lockpattern_need_to_unlock">"Potwierdź zapisany wzór"</string>
     <string name="lockpattern_need_to_unlock_wrong">"Niestety, spróbuj ponownie:"</string>
     <string name="lockpattern_recording_intro_header">"Narysuj wzór odblokowania"</string>
-    <string name="lockpattern_recording_intro_footer">"Naciśnij przycisk Menu, aby uzyskać pomoc."</string>
+    <string name="lockpattern_recording_intro_footer">"Naciśnij Menu, aby uzyskać pomoc."</string>
     <string name="lockpattern_recording_inprogress">"Puść palec, gdy gotowe."</string>
     <string name="lockpattern_recording_incorrect_too_short">"Połącz co najmniej <xliff:g id="NUMBER">%d</xliff:g> punktów. Spróbuj jeszcze raz:"</string>
     <string name="lockpattern_pattern_entered_header">"Wzór został nagrany!"</string>
@@ -509,12 +510,12 @@
     <string name="lockpattern_confirm_button_text">"Potwierdź"</string>
     <string name="lockpattern_restart_button_text">"Narysuj ponownie"</string>
     <string name="lockpattern_retry_button_text">"Ponów próbę"</string>
-    <string name="lockpattern_continue_button_text">"Kontynuuj"</string>
+    <string name="lockpattern_continue_button_text">"Dalej"</string>
     <string name="lockpattern_settings_title">"Wzór odblokowania"</string>
     <string name="lockpattern_settings_enable_title">"Wymagaj wzoru"</string>
     <string name="lockpattern_settings_enable_summary">"Trzeba narysować wzór, aby odblokować ekran"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Skorzystaj z widocznego wzoru"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title">"Używaj dotykowych informacji zwrotnych"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Wzór jest widoczny"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Wibracje przy rysowaniu"</string>
     <string name="lockpattern_settings_choose_lock_pattern">"Ustaw wzór odblokowania"</string>
     <string name="lockpattern_settings_change_lock_pattern">"Zmień wzór odblokowania"</string>
     <string name="lockpattern_settings_help_how_to_record">"Jak narysować wzór odblokowania"</string>
@@ -523,16 +524,16 @@
     <string name="skip_button_label">"Anuluj"</string>
     <string name="next_button_label">"Dalej"</string>
     <string name="lock_title">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez stworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Kiedy zechcesz, narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej 4 punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić niezabezpieczony telefon, wybierz „Anuluj”."</font></string>
+    <string name="lock_intro_message"><font size="17">"Chroń swój telefon przed nieuprawnionym użyciem przez stworzenie osobistego wzoru odblokowania ekranu. "\n<font height="17">\n</font><b>"1"</b>" Obejrzyj rysowanie przykładowego wzoru na następnym ekranie. "\n<font height="17">\n</font><b>"2"</b>" Następnie narysuj swój własny wzór odblokowania. Eksperymentuj z różnymi wzorami, ale połącz co najmniej 4 punkty. "\n<font height="17">\n</font><b>"3"</b>" Narysuj swój wzór ponownie dla potwierdzenia. "\n<font height="17">\n</font><b>"Możemy zaczynać? Wybierz „Dalej”"</b>". "\n<font height="3">\n</font>"Aby zrezygnować z ustawiania blokady, wybierz „Anuluj”."</font></string>
     <string name="lock_example_title">"Przykładowy wzór"</string>
-    <string name="lock_example_message">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, kiedy zechcesz narysować własny wzór."</string>
+    <string name="lock_example_message">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, aby narysować własny wzór."</string>
     <string name="manageapplications_settings_title">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary">"Zarządzaj zainstalowanymi aplikacjami oraz usuwaj je"</string>
     <string name="applications_settings">"Aplikacje"</string>
     <string name="applications_settings_summary">"Zarządzaj aplikacjami, skonfiguruj skróty szybkiego uruchamiania"</string>
     <string name="applications_settings_header">"Ustawienia aplikacji"</string>
     <string name="install_applications">"Nieznane źródła"</string>
-    <string name="install_unknown_applications">"Pozwól na instalowanie aplikacji ze źródeł pozarynkowych"</string>
+    <string name="install_unknown_applications">"Pozwól na instalowanie aplikacji spoza Android Market"</string>
     <string name="install_all_warning">"Telefon i dane osobiste są bardziej narażone na atak za pomocą aplikacji z nieznanych źródeł. Zgadzasz się ponieść pełną odpowiedzialność za wszelkie uszkodzenia telefonu oraz utratę danych, które mogą wyniknąć ze stosowania tych aplikacji."</string>
     <string name="application_info_label">"Informacje o aplikacji"</string>
     <string name="storage_label">"Pamięć"</string>
@@ -573,19 +574,19 @@
     <string name="computing_size">"Przetwarzanie..."</string>
     <string name="invalid_size_value">"Nie można obliczyć rozmiaru pakietu"</string>
     <string name="empty_list_msg">"Nie zainstalowano żadnych aplikacji innych firm."</string>
-    <string name="language_settings">"Ustawienia regionalne i ustawienia tekstu"</string>
+    <string name="language_settings">"Regionalne i język"</string>
     <string name="language_settings_summary">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
     <string name="language_category">"Ustawienia regionalne"</string>
     <string name="text_category">"Ustawienia tekstu"</string>
-    <string name="phone_language">"Wybierz ustawienia regionalne"</string>
+    <string name="phone_language">"Wybierz język"</string>
     <string name="phone_language_summary">"Wybierz język i region"</string>
-    <string name="auto_replace">"Automatyczne zastępowanie"</string>
+    <string name="auto_replace">"Autokorekta"</string>
     <string name="auto_replace_summary">"Poprawiaj błędnie wpisane słowa"</string>
-    <string name="auto_caps">"Automatyczne wielkie litery"</string>
+    <string name="auto_caps">"Wielka litera po kropce"</string>
     <string name="auto_caps_summary">"Zdanie zaczynaj wielką literą"</string>
-    <string name="auto_punctuate">"Automatyczna interpunkcja"</string>
+    <string name="auto_punctuate">"Łatwa interpunkcja"</string>
     <string name="hardkeyboard_category">"Ustawienia klawiatury fizycznej"</string>
-    <string name="auto_punctuate_summary">"Naciśnij klawisz spacji dwukrotnie, aby wstawić „.”"</string>
+    <string name="auto_punctuate_summary">"Naciśnij klawisz spacji dwukrotnie, aby wstawić kropkę."</string>
     <string name="show_password">"Widoczne hasła"</string>
     <string name="show_password_summary">"Pokazuj hasło podczas wpisywania"</string>
     <string name="user_dict_settings_titlebar">"Słownik użytkownika"</string>
@@ -613,16 +614,19 @@
     <string name="quick_launch_display_mode_shortcuts">"Skróty"</string>
     <string name="input_methods_settings_title">"Wprowadzanie tekstu"</string>
     <string name="input_methods_settings_summary">"Zarządzaj opcjami wprowadzania tekstu"</string>
-    <string name="input_methods_settings_label_format">"%s — ustawienia"</string>
-    <string name="development_settings_title">"Tworzenie"</string>
-    <string name="development_settings_summary">"Ustaw opcje związane z projektowaniem aplikacji"</string>
+    <string name="input_methods_settings_label_format">"%s – ustawienia"</string>
+    <string name="development_settings_title">"Programowanie"</string>
+    <string name="development_settings_summary">"Ustaw opcje związane z programowaniem aplikacji"</string>
     <string name="enable_adb">"Debugowanie USB"</string>
     <string name="enable_adb_summary">"Tryb debugowania, gdy podłączone jest USB"</string>
     <string name="keep_screen_on">"Zostaw włączony"</string>
     <string name="keep_screen_on_summary">"Ekran nigdy nie będzie gaszony podczas ładowania"</string>
-    <string name="allow_mock_location">"Zezwalaj na pozorowane położenia"</string>
+    <string name="allow_mock_location">"Pozorowanie położenia"</string>
     <string name="allow_mock_location_summary">"Zezwalaj na pozorowane położenia"</string>
-    <string name="gadget_picker_title">"Wybierz gadżet"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Szczegóły dla identyfikatora UID %d"</string>
     <string name="battery_history_uid">"Identyfikator UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Szczegóły wykorzystania sieci dla <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Pakiety współdzielące ten identyfikator UID:"</string>
     <string name="battery_history_no_data">"Brak danych o użyciu baterii"</string>
     <string name="battery_history_sensor">"Czujnik:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Czujnik używany przez pakiety:"</string>
     <string name="battery_history_sensor_usage">"Używane <xliff:g id="COUNT">%1$d</xliff:g> raz(y) przez <xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"Używane <xliff:g id="COUNT">%1$d</xliff:g> raz(y) przez:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Czas pracy z włączonym ekranem:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"Praca na baterii:"</string>
     <string name="battery_history_screen_on_plugged">"Podłączone:"</string>
     <string name="usage_stats_label">"Statystyki użycia"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 4db91fb..f9afd8e 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -55,18 +55,15 @@
     <item>"Никогда, если устройство подключено к сети питания"</item>
     <item>"Никогда"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"Использование процессора"</item>
-    <item>"Использование сети"</item>
-    <item>"Использование сенсора"</item>
-    <item>"Время пребывания экрана во включенном состоянии"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"С перезагрузки устройства"</item>
-    <item>"До последней загрузки"</item>
-    <item>"С последней загрузки"</item>
-    <item>"С последнего отключения питания"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"Время использования"</item>
     <item>"Начать подсчет"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 57f95ee..0a80622 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"Отключено"</string>
     <string name="bluetooth_disconnecting">"Отключение…"</string>
     <string name="bluetooth_connecting">"Идет подключение…"</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"Создать пару с этим устройством"</string>
     <string name="bluetooth_pairing">"Идет создание пары..."</string>
-    <string name="bluetooth_paired">"Соединено. Отключено."</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"гарнитура/наушники"</string>
     <string name="progress_scanning">"Сканирование"</string>
     <string name="bluetooth_notif_ticker">"Запрос на соединение Bluetooth"</string>
     <string name="bluetooth_notif_title">"Запрос на соединение"</string>
-    <string name="bluetooth_notif_message">"Выбрать для соединения"</string>
+    <string name="bluetooth_notif_message">"Выбрать для соединения "</string>
     <string name="date_and_time">"Настройки даты и времени"</string>
     <string name="date_time_12_hour_sample">"13:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"Выбрать часовой пояс"</string>
     <string name="display_preview_label">"Предварительный просмотр:"</string>
     <string name="display_font_size_label">"Размер шрифта:"</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"Отправить <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"Форматировать карту SD"</string>
     <string name="sd_format_summary">"Форматировать (очистить) карту SD"</string>
     <string name="sd_unavailable">"Недоступно"</string>
-    <string name="read_only">"(Только для чтения)"</string>
+    <string name="read_only">" (Только для чтения)"</string>
     <string name="battery_status_title">"Состояние батареи"</string>
     <string name="battery_level_title">"Уровень батареи"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"При зарядке экран не отключается"</string>
     <string name="allow_mock_location">"Разрешить фиктивные местоположения"</string>
     <string name="allow_mock_location_summary">"Разрешить фиктивные местоположения"</string>
-    <string name="gadget_picker_title">"Выбрать·гаджет"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"Сведения для идентификатора пользователя %d"</string>
     <string name="battery_history_uid">"Идентификатор пользователя <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"Сведения об использовании сети приложением <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"Пакеты с этим идентификатором пользователя:"</string>
     <string name="battery_history_no_data">"Данные об использовании батареи недоступны"</string>
     <string name="battery_history_sensor">"Сенсор:"</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"Использования сенсора пакетами:"</string>
     <string name="battery_history_sensor_usage">"Использовано пакетом <xliff:g id="PACKAGE">%2$s</xliff:g>: <xliff:g id="COUNT">%1$d</xliff:g> раз(а)"</string>
     <string name="battery_history_sensor_usage_multi">"Использовано <xliff:g id="COUNT">%1$d</xliff:g> раз(а) одним из:"</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"Время пребывания экрана включенным:"</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"От батареи:"</string>
     <string name="battery_history_screen_on_plugged">"Подключен к питанию:"</string>
     <string name="usage_stats_label">"Статистика использования"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 0cc7a2c..5b3b651 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -55,18 +55,15 @@
     <item>"插入后从不进入休眠状态"</item>
     <item>"从不"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU 使用"</item>
-    <item>"网络使用"</item>
-    <item>"传感器使用"</item>
-    <item>"屏幕开启时间"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"自设备重置后"</item>
-    <item>"在上次引导前"</item>
-    <item>"自上次引导后"</item>
-    <item>"自上次拔除后"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"使用时间"</item>
     <item>"启动次数"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 51e8bd6..45148de 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"已断开连接"</string>
     <string name="bluetooth_disconnecting">"正在断开连接..."</string>
     <string name="bluetooth_connecting">"正在连接..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"与此设备配对"</string>
     <string name="bluetooth_pairing">"正在配对..."</string>
-    <string name="bluetooth_paired">"已配对。已断开连接。"</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"免持听筒/耳机"</string>
     <string name="progress_scanning">"正在扫描"</string>
     <string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title">"配对请求"</string>
-    <string name="bluetooth_notif_message">"选择以与以下对象配对"</string>
+    <string name="bluetooth_notif_message">"选择以与以下对象配对 "</string>
     <string name="date_and_time">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample">"下午 1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"选择时区"</string>
     <string name="display_preview_label">"预览："</string>
     <string name="display_font_size_label">"字体大小："</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"发送<xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>："</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"格式化 SD 卡"</string>
     <string name="sd_format_summary">"格式化（清除）SD 卡"</string>
     <string name="sd_unavailable">"不可用"</string>
-    <string name="read_only">"（只读）"</string>
+    <string name="read_only">" （只读）"</string>
     <string name="battery_status_title">"电池状态"</string>
     <string name="battery_level_title">"电池级别"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location">"允许模仿位置"</string>
     <string name="allow_mock_location_summary">"允许模仿位置"</string>
-    <string name="gadget_picker_title">"选择小工具"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"有关用户 ID %d 的详情"</string>
     <string name="battery_history_uid">"用户 ID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"有关<xliff:g id="APP_NAME">%1$s</xliff:g>的网络使用详情："</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"共享该用户 ID 的数据包："</string>
     <string name="battery_history_no_data">"没有可用的电池使用数据"</string>
     <string name="battery_history_sensor">"传感器："</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"包使用的传感器："</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g>使用了 <xliff:g id="COUNT">%1$d</xliff:g> 次"</string>
     <string name="battery_history_sensor_usage_multi">"由以下某项使用过 <xliff:g id="COUNT">%1$d</xliff:g> 次："</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"屏幕开启所花费的时间："</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"正在使用电池："</string>
     <string name="battery_history_screen_on_plugged">"已插入："</string>
     <string name="usage_stats_label">"使用情况统计"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 9d9fc9ca..2ec9ed2 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -55,18 +55,15 @@
     <item>"插入時絕不"</item>
     <item>"從不"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU 使用率"</item>
-    <item>"網路使用率"</item>
-    <item>"感應器使用率"</item>
-    <item>"螢幕開啟時間"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"自上次重設裝置後的時間"</item>
-    <item>"上次開機前的時間"</item>
-    <item>"自最後一次開機後的時間"</item>
-    <item>"自上次拔除插頭後的時間"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"使用時間"</item>
     <item>"啟動計數"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1dda82c..c34d6a5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"連線中斷"</string>
     <string name="bluetooth_disconnecting">"連線中斷..."</string>
     <string name="bluetooth_connecting">"連線中..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"與此裝置配對"</string>
     <string name="bluetooth_pairing">"配對中..."</string>
-    <string name="bluetooth_paired">"已配對。連線中斷。"</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"免持/頭戴式"</string>
     <string name="progress_scanning">"掃描中"</string>
     <string name="bluetooth_notif_ticker">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title">"配對要求"</string>
-    <string name="bluetooth_notif_message">"選取要配對的裝置"</string>
+    <string name="bluetooth_notif_message">"選取要配對的裝置 "</string>
     <string name="date_and_time">"日期與時間設定"</string>
     <string name="date_time_12_hour_sample">"下午 1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"選取時區"</string>
     <string name="display_preview_label">"預覽："</string>
     <string name="display_font_size_label">"字型大小："</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"傳送 <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>："</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"將 SD 卡格式化"</string>
     <string name="sd_format_summary">"將 SD 卡格式化 (清除)"</string>
     <string name="sd_unavailable">"無法取得資訊"</string>
-    <string name="read_only">"(唯讀)"</string>
+    <string name="read_only">" (唯讀)"</string>
     <string name="battery_status_title">"電池狀態"</string>
     <string name="battery_level_title">"電池計量"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"充電時螢幕不會進入休眠"</string>
     <string name="allow_mock_location">"允許模擬位置"</string>
     <string name="allow_mock_location_summary">"允許模擬位置"</string>
-    <string name="gadget_picker_title">"選擇小工具"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"UID %d 的詳細資料"</string>
     <string name="battery_history_uid">"UID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"<xliff:g id="APP_NAME">%1$s</xliff:g> 的網路使用率詳細資料："</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"共用此 UID 的封裝："</string>
     <string name="battery_history_no_data">"沒有電池使用資料"</string>
     <string name="battery_history_sensor">"感應器："</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"程式使用的感應器："</string>
     <string name="battery_history_sensor_usage">"使用次數：<xliff:g id="COUNT">%1$d</xliff:g>，使用的封裝：<xliff:g id="PACKAGE">%2$s</xliff:g>"</string>
     <string name="battery_history_sensor_usage_multi">"使用次數：<xliff:g id="COUNT">%1$d</xliff:g>，使用者為下列其中之一："</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"螢幕開啟時間："</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"使用電池："</string>
     <string name="battery_history_screen_on_plugged">"插入時間："</string>
     <string name="usage_stats_label">"使用統計資料"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 019755a..d9480c2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -145,12 +145,12 @@
 
     <!-- Match with constants in BatteryHistory class -->
     <string-array name="battery_history_type_spinner">
-        <item>CPU Usage</item>
-        <item>Network Usage</item>
-        <item>GPS Usage</item>
-        <item>Sensor Usage</item>
-        <item>Wake Locks</item>
-        <item>Screen On Time</item>
+        <item>CPU usage</item>
+        <item>Network usage</item>
+        <item>GPS usage</item>
+        <item>Sensor usage</item>
+        <item>Partial wake usage</item>
+        <item>Other usage</item>
     </string-array>
 
     <!-- Match with constants in BatteryStats class -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 27329c8..ecf6e02 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1005,6 +1005,12 @@
     <string name="error_mcc_not3">MCC field must be 3 digits.</string>
     <!-- APN error dialog messages: -->
     <string name="error_mnc_not23">MNC field must be 2 or 3 digits.</string>
+    <!-- The message of dialog indicated restoring default APN settings in progress -->
+    <string name="restore_default_apn">Restoring default APN settings</string>
+    <!-- APNs screen menu option to reset default APN settings --> 
+    <string name="menu_restore">Reset to default</string>    
+    <!-- APNs screen toast message to inform reset default APN settings is completed -->     
+    <string name="restore_default_apn_completed">Reset default APN settings completed</string>    
 
     <!-- Master Clear -->
     <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
@@ -1383,8 +1389,13 @@
     <string name="allow_mock_location_summary">Allow mock locations</string>
 
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
-    (or other screens that can host gadgets) -->
-    <string name="gadget_picker_title">Choose Gadget</string>
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+    <string name="gadget_picker_title">Choose gadget</string>
+    <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+    <string name="widget_picker_title">Choose widget</string>
 
     <!-- Used to display "Details for UID 1234" in BatteryHistory -->
     <string name="battery_history_details_for">Details for UID %d</string>
@@ -1452,17 +1463,33 @@
     <!-- Used for Sensor detail screen in BatteryHistory -->
     <string name="battery_history_sensor_usage_multi">Used <xliff:g id="count">%1$d</xliff:g> times by one of:</string>
     
+    <!-- Used for label of awake bar in BatteryHistory -->
+    <string name="battery_history_awake_label">Running</string>
+    
+    <!-- Used for label of screen on bar in BatteryHistory -->
+    <string name="battery_history_screen_on_label">Screen on</string>
+    
+    <!-- Used for label of phone on bar in BatteryHistory -->
+    <string name="battery_history_phone_on_label">Phone on</string>
+    
+    <!-- Used for awake time message in BatteryHistory -->
+    <string name="battery_history_awake">Time spent without sleeping:</string>
+    
     <!-- Used for Screen on time message in BatteryHistory -->
     <string name="battery_history_screen_on">Time spent with screen on:</string>
     
+    <!-- Used for Phone on time message in BatteryHistory -->
+    <string name="battery_history_phone_on">Time spent with phone on:</string>
+    
     <!-- Used for Screen on time message in BatteryHistory -->
     <string name="battery_history_screen_on_battery">On battery:</string>
     
-    <!-- Used for Screen on time message in BatteryHistory -->
+    <!-- XXX remove? Used for Screen on time message in BatteryHistory -->
     <string name="battery_history_screen_on_plugged">Plugged in:</string>
 
-    <!-- Strings used for displaying usage statistics -->
+    <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
+    
     <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
     <string name="testing_usage_stats">Usage statistics</string>
     <!-- label for text to indicate sort options -->
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 2927540..050896f 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -26,15 +26,9 @@
                 android:targetClass="com.android.settings.LocalePicker"/>
     </PreferenceScreen>
 
-    <PreferenceCategory
+    <PreferenceCategory android:key="text_category"
             android:title="@string/text_category" />
-    <PreferenceScreen 
-            android:title="@string/input_methods_settings_title" 
-            android:summary="@string/input_methods_settings_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.InputMethodsSettings" />
-    </PreferenceScreen>
+
     <PreferenceScreen 
             android:title="@string/user_dict_settings_title" 
             android:summary="@string/user_dict_settings_summary">
@@ -42,6 +36,7 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.UserDictionarySettings" />
     </PreferenceScreen>
+
     <PreferenceCategory
             android:key="hardkeyboard_category"
             android:title="@string/hardkeyboard_category">
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index aab529c..87e3412 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -16,60 +16,86 @@
 
 package com.android.settings;
 
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 public class ApnSettings extends PreferenceActivity {
 
     public static final String EXTRA_POSITION = "position";
-    
+    public static final String RESTORE_CARRIERS_URI =
+        "content://telephony/carriers/restore";
+
     private static final int ID_INDEX = 0;
     private static final int NAME_INDEX = 1;
     private static final int APN_INDEX = 2;
 
     private static final int MENU_NEW = Menu.FIRST;
-    
+    private static final int MENU_RESTORE = Menu.FIRST + 1;
+
+    private static final int EVENT_RESTORE_DEFAULTAPN_START = 1;
+    private static final int EVENT_RESTORE_DEFAULTAPN_COMPLETE = 2;
+
+    private static final int DIALOG_RESTORE_DEFAULTAPN = 1001;
+
+    private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
+
+    private static boolean mRestoreDefaultApnMode;
+
+    private RestoreApnUiHandler mRestoreApnUiHandler;
+    private RestoreApnProcessHandler mRestoreApnProcessHandler;
+
     private Cursor mCursor;
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        
-        addPreferencesFromResource(R.xml.apn_settings);    
+
+        addPreferencesFromResource(R.xml.apn_settings);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        
-        fillList();
+
+        if (!mRestoreDefaultApnMode) {
+            fillList();
+        } else {
+            showDialog(DIALOG_RESTORE_DEFAULTAPN);
+        }
     }
-    
+
     private void fillList() {
         mCursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn"}, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
         apnList.removeAll();
-        
+
         mCursor.moveToFirst();
         while (!mCursor.isAfterLast()) {
             String name = mCursor.getString(NAME_INDEX);
             String apn = mCursor.getString(APN_INDEX);
-            
+
             if (name != null && apn != null && TextUtils.getTrimmedLength(name) > 0
                     && TextUtils.getTrimmedLength(apn) > 0) {
                 Preference pref = new Preference((Context) this);
@@ -79,17 +105,20 @@
                 pref.setPersistent(false);
                 apnList.addPreference(pref);
             }
-            
+
             mCursor.moveToNext();
         }
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        menu.add(0, MENU_NEW, 0, 
+        menu.add(0, MENU_NEW, 0,
                 getResources().getString(R.string.menu_new))
                 .setIcon(android.R.drawable.ic_menu_add);
+        menu.add(0, MENU_RESTORE, 0,
+                getResources().getString(R.string.menu_restore))
+                .setIcon(android.R.drawable.ic_menu_upload);
         return true;
     }
 
@@ -99,14 +128,18 @@
         case MENU_NEW:
             addNewApn();
             return true;
+
+        case MENU_RESTORE:
+            restoreDefaultApn();
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
-    
+
     private void addNewApn() {
         startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));
     }
-    
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         int pos = Integer.parseInt(preference.getKey());
@@ -114,4 +147,83 @@
         startActivity(new Intent(Intent.ACTION_EDIT, url));
         return true;
     }
+
+    private boolean restoreDefaultApn() {
+        showDialog(DIALOG_RESTORE_DEFAULTAPN);
+        mRestoreDefaultApnMode = true;
+
+        if (mRestoreApnUiHandler == null) {
+            mRestoreApnUiHandler = new RestoreApnUiHandler();
+        }
+
+        if (mRestoreApnProcessHandler == null) {
+            HandlerThread restoreDefaultApnThread = new HandlerThread(
+                    "Restore default APN Handler: Process Thread");
+            restoreDefaultApnThread.start();
+            mRestoreApnProcessHandler = new RestoreApnProcessHandler(
+                    restoreDefaultApnThread.getLooper(), mRestoreApnUiHandler);
+        }
+
+        mRestoreApnProcessHandler
+                .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_START);
+        return true;
+    }
+
+    private class RestoreApnUiHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_RESTORE_DEFAULTAPN_COMPLETE:
+                    fillList();
+                    getPreferenceScreen().setEnabled(true);
+                    mRestoreDefaultApnMode = false;
+                    dismissDialog(DIALOG_RESTORE_DEFAULTAPN);
+                    Toast.makeText(
+                        ApnSettings.this,
+                        getResources().getString(
+                                R.string.restore_default_apn_completed),
+                        Toast.LENGTH_LONG).show();
+                    break;
+            }
+        }
+    }
+
+    private class RestoreApnProcessHandler extends Handler {
+        private Handler mRestoreApnUiHandler;
+
+        public RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
+            super(looper);
+            this.mRestoreApnUiHandler = restoreApnUiHandler;
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_RESTORE_DEFAULTAPN_START:
+                    ContentResolver resolver = getContentResolver();
+                    resolver.delete(DEFAULTAPN_URI, null, null);                    
+                    mRestoreApnUiHandler
+                        .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
+                    break;
+            }
+        }
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        if (id == DIALOG_RESTORE_DEFAULTAPN) {
+            ProgressDialog dialog = new ProgressDialog(this);
+            dialog.setMessage(getResources().getString(R.string.restore_default_apn));
+            dialog.setCancelable(false);
+            return dialog;
+        }
+        return null;
+    }
+
+    @Override
+    protected void onPrepareDialog(int id, Dialog dialog) {
+        if (id == DIALOG_RESTORE_DEFAULTAPN) {
+            getPreferenceScreen().setEnabled(false);
+        }
+    }
 }
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 3097e96..47fc07f 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -292,6 +292,7 @@
 
         mLockPatternView = (LockPatternView) findViewById(R.id.lockPattern);
         mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
+        mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());        
 
         mFooterText = (TextView) findViewById(R.id.footerText);
 
diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java
index eee8b75..327874b 100644
--- a/src/com/android/settings/InstalledAppDetails.java
+++ b/src/com/android/settings/InstalledAppDetails.java
@@ -444,7 +444,7 @@
                 Uri packageURI = Uri.parse("package:"+packageName);
                 Intent uninstallIntent = new Intent(Intent.ACTION_DELETE, packageURI);
                 startActivity(uninstallIntent);
-                setIntentAndFinish(true, false);
+                setIntentAndFinish(true, true);
             }
         } else if(v == mActivitiesButton) {
             mPm.clearPackagePreferredActivities(packageName);
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
index b406df6..8463d26 100644
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -17,14 +17,24 @@
 package com.android.settings;
 
 import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.preference.CheckBoxPreference;
+import android.provider.Settings;
 import android.provider.Settings.System;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import java.util.HashSet;
+import java.util.List;
 
 public class LanguageSettings extends PreferenceActivity {
     
@@ -48,6 +58,18 @@
             1,
     };
     
+    private List<InputMethodInfo> mInputMethodProperties;
+
+    final TextUtils.SimpleStringSplitter mStringColonSplitter
+            = new TextUtils.SimpleStringSplitter(':');
+    
+    private String mLastInputMethodId;
+    private String mLastTickedInputMethodId;
+
+    static public String getInputMethodIdFromKey(String key) {
+        return key;
+    }
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -71,10 +93,117 @@
                                               mSettingsDefault[i]) > 0);
             }
         }
+
+        onCreateIMM();
+    }
+    
+    private void onCreateIMM() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        mInputMethodProperties = imm.getInputMethodList();
+
+        mLastInputMethodId = Settings.Secure.getString(getContentResolver(),
+            Settings.Secure.DEFAULT_INPUT_METHOD);
+        
+        PreferenceGroup textCategory = (PreferenceGroup) findPreference("text_category");
+        
+        int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties
+                .size());
+        for (int i = 0; i < N; ++i) {
+            InputMethodInfo property = mInputMethodProperties.get(i);
+            String prefKey = property.getId();
+
+            CharSequence label = property.loadLabel(getPackageManager());
+            
+            // Add a check box.
+            CheckBoxPreference chkbxPref = new CheckBoxPreference(this);
+            chkbxPref.setKey(prefKey);
+            chkbxPref.setTitle(label);
+            textCategory.addPreference(chkbxPref);
+
+            // If setting activity is available, add a setting screen entry.
+            if (null != property.getSettingsActivity()) {
+                PreferenceScreen prefScreen = new PreferenceScreen(this, null);
+                prefScreen.setKey(property.getSettingsActivity());
+                CharSequence settingsLabel = getResources().getString(
+                        R.string.input_methods_settings_label_format, label);
+                prefScreen.setTitle(settingsLabel);
+                textCategory.addPreference(prefScreen);
+            }
+        }
     }
     
     @Override
+    protected void onResume() {
+        super.onResume();
+
+        final HashSet<String> enabled = new HashSet<String>();
+        String enabledStr = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_INPUT_METHODS);
+        if (enabledStr != null) {
+            final TextUtils.SimpleStringSplitter splitter = mStringColonSplitter;
+            splitter.setString(enabledStr);
+            while (splitter.hasNext()) {
+                enabled.add(splitter.next());
+            }
+        }
+        
+        // Update the statuses of the Check Boxes.
+        int N = mInputMethodProperties.size();
+        for (int i = 0; i < N; ++i) {
+            final String id = mInputMethodProperties.get(i).getId();
+            CheckBoxPreference pref = (CheckBoxPreference) findPreference(mInputMethodProperties
+                    .get(i).getId());
+            pref.setChecked(enabled.contains(id));
+        }
+        mLastTickedInputMethodId = null;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        StringBuilder builder = new StringBuilder(256);
+        
+        boolean haveLastInputMethod = false;
+        
+        int firstEnabled = -1;
+        int N = mInputMethodProperties.size();
+        for (int i = 0; i < N; ++i) {
+            final String id = mInputMethodProperties.get(i).getId();
+            CheckBoxPreference pref = (CheckBoxPreference) findPreference(id);
+            boolean hasIt = id.equals(mLastInputMethodId);
+            if (pref.isChecked()) {
+                if (builder.length() > 0) builder.append(':');
+                builder.append(id);
+                if (firstEnabled < 0) {
+                    firstEnabled = i;
+                }
+                if (hasIt) haveLastInputMethod = true;
+            } else if (hasIt) {
+                mLastInputMethodId = mLastTickedInputMethodId;
+            }
+        }
+
+        // If the last input method is unset, set it as the first enabled one.
+        if (null == mLastInputMethodId || "".equals(mLastInputMethodId)) {
+            if (firstEnabled >= 0) {
+                mLastInputMethodId = mInputMethodProperties.get(firstEnabled).getId();
+            } else {
+                mLastInputMethodId = null;
+            }
+        }
+        
+        Settings.Secure.putString(getContentResolver(),
+            Settings.Secure.ENABLED_INPUT_METHODS, builder.toString());
+        Settings.Secure.putString(getContentResolver(),
+            Settings.Secure.DEFAULT_INPUT_METHOD, mLastInputMethodId);
+    }
+
+    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        // Physical keyboard stuff
         for (int i = 0; i < mSettingsUiKey.length; i++) {
             if (mSettingsUiKey[i].equals(preference.getKey())) {
                 System.putInt(getContentResolver(), mSettingsSystemId[i], 
@@ -82,6 +211,36 @@
                 return true;
             }
         }
+
+        // Input Method stuff
+        // Those monkeys kept committing suicide, so we add this property
+        // to disable this functionality
+        if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
+            return false;
+        }
+
+        if (preference instanceof CheckBoxPreference) {
+            CheckBoxPreference chkPref = (CheckBoxPreference) preference;
+            String id = getInputMethodIdFromKey(chkPref.getKey());
+            if (chkPref.isChecked()) {
+                mLastTickedInputMethodId = id;
+            } else if (id.equals(mLastTickedInputMethodId)) {
+                mLastTickedInputMethodId = null;
+            }
+        } else if (preference instanceof PreferenceScreen) {
+            if (preference.getIntent() == null) {
+                PreferenceScreen pref = (PreferenceScreen) preference;
+                String activityName = pref.getKey();
+                String packageName = activityName.substring(0, activityName
+                        .lastIndexOf("."));
+                if (activityName.length() > 0) {
+                    Intent i = new Intent(Intent.ACTION_MAIN);
+                    i.setClassName(packageName, activityName);
+                    startActivity(i);
+                }
+            }
+        }
+
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
diff --git a/src/com/android/settings/LauncherGadgetBinder.java b/src/com/android/settings/LauncherGadgetBinder.java
new file mode 100644
index 0000000..f7b5a61
--- /dev/null
+++ b/src/com/android/settings/LauncherGadgetBinder.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.gadget.GadgetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.BaseColumns;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class LauncherGadgetBinder extends Activity {
+    private static final String TAG = "LauncherGadgetBinder";
+    private static final boolean LOGD = true;
+    
+    static final String AUTHORITY = "com.android.launcher.settings";
+    static final String TABLE_FAVORITES = "favorites";
+    
+    static final String EXTRA_BIND_SOURCES = "com.android.launcher.settings.bindsources";
+    static final String EXTRA_BIND_TARGETS = "com.android.launcher.settings.bindtargets";
+
+    static final String EXTRA_GADGET_BITMAPS = "com.android.camera.gadgetbitmaps";
+    
+    /**
+     * {@link ContentProvider} constants pulled over from Launcher
+     */
+    static final class LauncherProvider implements BaseColumns {
+        static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/" + TABLE_FAVORITES);
+
+        static final String ITEM_TYPE = "itemType";
+        static final String GADGET_ID = "gadgetId";
+        static final String ICON = "icon";
+
+        static final int ITEM_TYPE_GADGET = 4;
+        static final int ITEM_TYPE_WIDGET_CLOCK = 1000;
+        static final int ITEM_TYPE_WIDGET_SEARCH = 1001;
+        static final int ITEM_TYPE_WIDGET_PHOTO_FRAME = 1002;
+    }
+    
+    static final String[] BIND_PROJECTION = new String[] {
+        LauncherProvider._ID,
+        LauncherProvider.ITEM_TYPE,
+        LauncherProvider.GADGET_ID,
+        LauncherProvider.ICON,
+    };
+    
+    static final int INDEX_ID = 0;
+    static final int INDEX_ITEM_TYPE = 1;
+    static final int INDEX_GADGET_ID = 2;
+    static final int INDEX_ICON = 3;
+    
+    static final ComponentName BIND_PHOTO_GADGET = new ComponentName("com.android.camera",
+            "com.android.camera.PhotoGadgetBind");
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        finish();
+
+        // This helper reaches into the Launcher database and binds any unlinked
+        // gadgets. If will remove any items that can't be bound successfully.
+        // We protect this binder at the manifest level by asserting the caller
+        // has the Launcher WRITE_SETTINGS permission.
+        
+        final Intent intent = getIntent();
+        final Bundle extras = intent.getExtras();
+        
+        int[] bindSources = null;
+        ArrayList<ComponentName> bindTargets = null;
+        Exception exception = null;
+
+        try {
+            bindSources = extras.getIntArray(EXTRA_BIND_SOURCES);
+            bindTargets = intent.getParcelableArrayListExtra(EXTRA_BIND_TARGETS);
+        } catch (ClassCastException ex) {
+            exception = ex;
+        }
+        
+        if (exception != null || bindSources == null || bindTargets == null ||
+                bindSources.length != bindTargets.size()) {
+            Log.w(TAG, "Problem reading incoming bind request, or invalid request", exception);
+            return;
+        }
+        
+        final String selectWhere = buildOrWhereString(LauncherProvider.ITEM_TYPE, bindSources);
+        
+        final ContentResolver resolver = getContentResolver();
+        final GadgetManager gadgetManager = GadgetManager.getInstance(this);
+        
+        boolean foundPhotoGadgets = false;
+        final ArrayList<Integer> photoGadgetIds = new ArrayList<Integer>();
+        final ArrayList<Bitmap> photoBitmaps = new ArrayList<Bitmap>();
+        
+        Cursor c = null;
+        
+        try {
+            c = resolver.query(LauncherProvider.CONTENT_URI,
+                    BIND_PROJECTION, selectWhere, null, null);
+            
+            if (LOGD) Log.d(TAG, "found bind cursor count="+c.getCount());
+            
+            final ContentValues values = new ContentValues();
+            while (c != null && c.moveToNext()) {
+                long favoriteId = c.getLong(INDEX_ID);
+                int itemType = c.getInt(INDEX_ITEM_TYPE);
+                int gadgetId = c.getInt(INDEX_GADGET_ID);
+                byte[] iconData = c.getBlob(INDEX_ICON);
+                
+                // Find the binding target for this type
+                ComponentName targetGadget = null;
+                for (int i = 0; i < bindSources.length; i++) {
+                    if (bindSources[i] == itemType) {
+                        targetGadget = bindTargets.get(i);
+                        break;
+                    }
+                }
+                
+                if (LOGD) Log.d(TAG, "found matching targetGadget="+targetGadget.toString()+" for favoriteId="+favoriteId);
+                
+                boolean bindSuccess = false;
+                try {
+                    gadgetManager.bindGadgetId(gadgetId, targetGadget);
+                    bindSuccess = true;
+                } catch (RuntimeException ex) {
+                    Log.w(TAG, "Problem binding gadget", ex);
+                }
+                
+                // Handle special case of photo gadget by loading bitmap and
+                // preparing for later binding
+                if (bindSuccess && iconData != null &&
+                        itemType == LauncherProvider.ITEM_TYPE_WIDGET_PHOTO_FRAME) {
+                    Bitmap bitmap = BitmapFactory.decodeByteArray(iconData, 0, iconData.length);
+                    
+                    photoGadgetIds.add(gadgetId);
+                    photoBitmaps.add(bitmap);
+                    foundPhotoGadgets = true;
+                }
+
+                if (LOGD) Log.d(TAG, "after finished, success="+bindSuccess);
+
+                // Depending on success, update launcher or remove item
+                Uri favoritesUri = ContentUris.withAppendedId(LauncherProvider.CONTENT_URI, favoriteId);
+                if (bindSuccess) {
+                    values.clear();
+                    values.put(LauncherProvider.ITEM_TYPE, LauncherProvider.ITEM_TYPE_GADGET);
+                    values.putNull(LauncherProvider.ICON);
+                    resolver.update(favoritesUri, values, null, null);
+                } else {
+                    resolver.delete(favoritesUri, null, null);
+                }
+                    
+            }
+        } catch (SQLException ex) {
+            Log.w(TAG, "Problem while binding gadgetIds for Launcher", ex);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+        
+        if (foundPhotoGadgets) {
+            // Convert gadgetIds into int[]
+            final int N = photoGadgetIds.size();
+            final int[] photoGadgetIdsArray = new int[N];
+            for (int i = 0; i < N; i++) {
+                photoGadgetIdsArray[i] = photoGadgetIds.get(i);
+            }
+            
+            // Launch intent over to handle bitmap binding, but we don't need to
+            // wait around for the result.
+            final Intent bindIntent = new Intent();
+            bindIntent.setComponent(BIND_PHOTO_GADGET);
+            
+            final Bundle bindExtras = new Bundle();
+            bindExtras.putIntArray(GadgetManager.EXTRA_GADGET_IDS, photoGadgetIdsArray);
+            bindExtras.putParcelableArrayList(EXTRA_GADGET_BITMAPS, photoBitmaps);
+            bindIntent.putExtras(bindExtras);
+            
+            startActivity(bindIntent);
+        }
+        
+        if (LOGD) Log.d(TAG, "completely finished with binding for Launcher");
+    }
+    
+    /**
+     * Build a query string that will match any row where the column matches
+     * anything in the values list.
+     */
+    static String buildOrWhereString(String column, int[] values) {
+        StringBuilder selectWhere = new StringBuilder();
+        for (int i = values.length - 1; i >= 0; i--) {
+            selectWhere.append(column).append("=").append(values[i]);
+            if (i > 0) {
+                selectWhere.append(" OR ");
+            }
+        }
+        return selectWhere.toString();
+    }
+    
+}
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index 512e547..74957ed 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -19,6 +19,7 @@
 import com.android.settings.R;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
@@ -31,6 +32,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -86,8 +88,6 @@
  *  ACTION_MANAGE_PACKAGE_STORAGE) the list is sorted per size.
  *  If the user selects an application, extended info(like size, uninstall/clear data options,
  *  permissions info etc.,) is displayed via the InstalledAppDetails activity.
- *  This activity passes the package name and size information to the 
- *  InstalledAppDetailsActivity to avoid recomputation of the package size information.
  */
 public class ManageApplications extends ListActivity implements
         OnItemClickListener, DialogInterface.OnCancelListener,
@@ -95,13 +95,12 @@
     // TAG for this activity
     private static final String TAG = "ManageApplications";
     
-    // log information boolean
+    // Log information boolean
     private boolean localLOGV = Config.LOGV || false;
     
     // attributes used as keys when passing values to InstalledAppDetails activity
     public static final String APP_PKG_PREFIX = "com.android.settings.";
     public static final String APP_PKG_NAME = APP_PKG_PREFIX+"ApplicationPkgName";
-    public static final String APP_PKG_SIZE = APP_PKG_PREFIX+"size";
     public static final String APP_CHG = APP_PKG_PREFIX+"changed";
     
     // attribute name used in receiver for tagging names of added/deleted packages
@@ -122,7 +121,7 @@
     public static final int FILTER_APPS_RUNNING = MENU_OPTIONS_BASE + 4;
     public static final int FILTER_OPTIONS = MENU_OPTIONS_BASE + 5;
     // Alert Dialog presented to user to find out the filter option
-    AlertDialog.Builder mAlertDlgBuilder;
+    AlertDialog mAlertDlg;
     // sort order
     private int mSortOrder = SORT_ORDER_ALPHA;
     // Filter value
@@ -157,7 +156,8 @@
     private Drawable mDefaultAppIcon;
     
     // temporary dialog displayed while the application info loads
-    private ProgressDialog mLoadingDlg = null;
+    private static final int DLG_BASE = 0;
+    private static final int DLG_LOADING = DLG_BASE + 1;
     
     // compute index used to track the application size computations
     private int mComputeIndex;
@@ -196,6 +196,12 @@
     // Boolean variables indicating state
     private boolean mLoadLabels = false;
     private boolean mSizesFirst = false;
+    // ListView used to display list
+    private ListView mListView;
+    // State variables used to figure out menu options and also
+    // initiate the first computation and loading of resources
+    private boolean mJustCreated = true;
+    private boolean mFirst = false;
     
     /*
      * Handler class to handle messages for various operations
@@ -242,8 +248,6 @@
             switch (msg.what) {
             case INIT_PKG_INFO:
                 if(localLOGV) Log.i(TAG, "Message INIT_PKG_INFO");
-                setProgressBarIndeterminateVisibility(true);
-                mComputeIndex = 0;
                 // Retrieve the package list and init some structures
                 initAppList(mFilterApps);
                 mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
@@ -308,6 +312,7 @@
                     } else {
                         // end computation here
                         mComputeSizes = true;
+                        mFirst = true;
                         mAppInfoAdapter.sortList(mSortOrder);
                         mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
                     }
@@ -408,8 +413,13 @@
                 } else {
                     // Create list view from the adapter here. Wait till the sort order
                     // of list is defined. its either by label or by size. so atleast one of the
-                    // first steps should be complete before creating the list
-                    createListView();
+                    // first steps should be complete before filling the list
+                    if (mJustCreated) {
+                        // Set the adapter here.
+                        mJustCreated = false;
+                        mListView.setAdapter(mAppInfoAdapter);
+                        dismissLoadingMsg();
+                    }
                     if (!mComputeSizes) {
                         initComputeSizes();
                     } else if (!mLoadLabels) {
@@ -423,6 +433,8 @@
         }
     };
     
+    
+    
     private void doneLoadingData() {
         setProgressBarIndeterminateVisibility(false);
     }
@@ -487,13 +499,14 @@
     
     // some initialization code used when kicking off the size computation
     private void initAppList(int filterOption) {
+        setProgressBarIndeterminateVisibility(true);
+        mComputeIndex = 0;
         mComputeSizes = false;
+        mLoadLabels = false;
         // Initialize lists
         List<ApplicationInfo> appList = getInstalledApps(filterOption);
         mAddRemoveMap = new TreeMap<String, Boolean>();
-        mAppInfoAdapter = new AppInfoAdapter(this, appList);       
-        // register receiver
-        mReceiver.registerReceiver();
+        mAppInfoAdapter.resetAppList(filterOption, appList);
     }
     
     // Utility method to start a thread to read application labels and icons
@@ -519,23 +532,13 @@
     private void showEmptyViewIfListEmpty() {
         if (localLOGV) Log.i(TAG, "Checking for empty view");
         if (mAppInfoAdapter.getCount() > 0) {
+            mListView.setVisibility(View.VISIBLE);
             mEmptyView.setVisibility(View.GONE);
         } else {
+            mListView.setVisibility(View.GONE);
             mEmptyView.setVisibility(View.VISIBLE);
         }
     }
-
-    private void createListView() {
-        dismissLoadingMsg();
-        // get list and set listeners and adapter
-        ListView lv= (ListView) findViewById(android.R.id.list);
-        lv.setAdapter(mAppInfoAdapter);
-        lv.setOnItemClickListener(this);
-        lv.setSaveEnabled(true);
-        lv.setItemsCanFocus(true);
-        lv.setOnItemClickListener(this);
-        showEmptyViewIfListEmpty();
-    }
     
     // internal structure used to track added and deleted packages when
     // the activity has focus
@@ -868,7 +871,11 @@
                 AppInfo pInfo = iconMap.get(info.packageName);
                 if(pInfo != null) {
                     AppInfo aInfo = mAppPropMap.get(info.packageName);
-                    aInfo.refreshIcon(pInfo);
+                    if (aInfo != null) {
+                        aInfo.refreshIcon(pInfo);
+                    } else {
+                        mAppPropMap.put(info.packageName, pInfo);
+                    }
                     changed = true;
                 }
             }
@@ -1114,12 +1121,6 @@
         requestWindowFeature(Window.FEATURE_PROGRESS);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.compute_sizes);
-        // init mLoadingDlg
-        mLoadingDlg = new ProgressDialog(this);
-        mLoadingDlg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        mLoadingDlg.setMessage(getText(R.string.loading));
-        mLoadingDlg.setIndeterminate(true);        
-        mLoadingDlg.setOnCancelListener(this);
         mDefaultAppIcon =Resources.getSystem().getDrawable(
                 com.android.internal.R.drawable.sym_def_app_icon);
         mInvalidSizeStr = getText(R.string.invalid_size_value);
@@ -1129,29 +1130,51 @@
         mReceiver = new PackageIntentReceiver();
         mEmptyView = (TextView) findViewById(R.id.empty_view);
         mObserver = new PkgSizeObserver();
+        // Create adapter and list view here
+        List<ApplicationInfo> appList = getInstalledApps(mSortOrder);
+        mAppInfoAdapter = new AppInfoAdapter(this, appList);
+        ListView lv= (ListView) findViewById(android.R.id.list);
+        //lv.setAdapter(mAppInfoAdapter);
+        lv.setOnItemClickListener(this);
+        lv.setSaveEnabled(true);
+        lv.setItemsCanFocus(true);
+        lv.setOnItemClickListener(this);
+        mListView = lv;
+        showLoadingMsg();
     }
     
-    private void showLoadingMsg() {
-        if (mLoadingDlg != null) {
-            if(localLOGV) Log.i(TAG, "Displaying Loading message");
-            mLoadingDlg.show();
+    @Override
+    public Dialog onCreateDialog(int id) {
+        if (id == DLG_LOADING) {
+            ProgressDialog dlg = new ProgressDialog(this);
+            dlg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+            dlg.setMessage(getText(R.string.loading));
+            dlg.setIndeterminate(true);        
+            dlg.setOnCancelListener(this);
+            return dlg;
         }
+        return null;
+    }
+    
+    
+    private void showLoadingMsg() {
+        showDialog(DLG_LOADING);
+        if(localLOGV) Log.i(TAG, "Displaying Loading message");
     }
     
     private void dismissLoadingMsg() {
-        if ((mLoadingDlg != null) && (mLoadingDlg.isShowing())) {
-            if(localLOGV) Log.i(TAG, "Dismissing Loading message");
-            mLoadingDlg.dismiss();
-        }
+        if(localLOGV) Log.i(TAG, "Dismissing Loading message");
+        dismissDialog(DLG_LOADING);
     }
     
     @Override
     public void onStart() {
         super.onStart();
-        showLoadingMsg();
         // Create a thread to load resources
         mResourceThread = new ResourceLoaderThread();
         sendMessageToHandler(INIT_PKG_INFO);
+        // register receiver
+        mReceiver.registerReceiver();
     }
 
     @Override
@@ -1164,6 +1187,12 @@
         mAppPropCache = mAppInfoAdapter.mAppPropMap;
     }
     
+    // Avoid the restart and pause when orientation changes
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+    
     /*
      * comparator class used to sort AppInfo objects based on size
      */
@@ -1191,13 +1220,11 @@
     }
      
     // utility method used to start sub activity
-    private void startApplicationDetailsActivity(ApplicationInfo info, PackageStats ps) {
+    private void startApplicationDetailsActivity() {
         // Create intent to start new activity
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setClass(this, InstalledAppDetails.class);
-        mCurrentPkgName = info.packageName;
         intent.putExtra(APP_PKG_NAME, mCurrentPkgName);
-        intent.putExtra(APP_PKG_SIZE, ps);
         // start new activity to display extended information
         startActivityForResult(intent, INSTALLED_APP_DETAILS);
     }
@@ -1215,12 +1242,12 @@
     
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mComputeSizes) {
+        if (mFirst) {
             menu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
             menu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
             menu.findItem(FILTER_OPTIONS).setVisible(true);
             return true;
-        } 
+        }
         return false;
     }
 
@@ -1230,16 +1257,17 @@
         if ((menuId == SORT_ORDER_ALPHA) || (menuId == SORT_ORDER_SIZE)) {
             sendMessageToHandler(REORDER_LIST, menuId);
         } else if (menuId == FILTER_OPTIONS) {
-            if (mAlertDlgBuilder == null) {
-                mAlertDlgBuilder = new AlertDialog.Builder(this).
-                setTitle(R.string.filter_dlg_title).
-                setNeutralButton(R.string.cancel, this).
-                setSingleChoiceItems(new CharSequence[] {getText(R.string.filter_apps_all),
-                        getText(R.string.filter_apps_running),
-                        getText(R.string.filter_apps_third_party)},
-                        -1, this);
+            if (mAlertDlg == null) {
+                mAlertDlg = new AlertDialog.Builder(this).
+                        setTitle(R.string.filter_dlg_title).
+                        setNeutralButton(R.string.cancel, this).
+                        setSingleChoiceItems(new CharSequence[] {getText(R.string.filter_apps_all),
+                                getText(R.string.filter_apps_running),
+                                getText(R.string.filter_apps_third_party)},
+                                -1, this).
+                        create();
             }
-            mAlertDlgBuilder.show();
+            mAlertDlg.show();
         }
         return true;
     }
@@ -1247,12 +1275,12 @@
     public void onItemClick(AdapterView<?> parent, View view, int position,
             long id) {
         ApplicationInfo info = (ApplicationInfo)mAppInfoAdapter.getItem(position);
-        startApplicationDetailsActivity(info, mAppInfoAdapter.getAppStats(info.packageName));
+        mCurrentPkgName = info.packageName;
+        startApplicationDetailsActivity();
     }
     
-    // onCancel call back for dialog thats displayed when data is being loaded
+    // Finish the activity if the user presses the back button to cancel the activity
     public void onCancel(DialogInterface dialog) {
-        mLoadingDlg = null;
         finish();
     }
 
@@ -1273,6 +1301,7 @@
         default:
             return;
         }
+        mAlertDlg.dismiss();
         sendMessageToHandler(REORDER_LIST, newOption);
     }
 }
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 89d5279..aeddcf7 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -21,10 +21,10 @@
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
+import android.text.InputType;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -198,6 +198,9 @@
     protected Dialog onCreateDialog(int id) {
         View content = getLayoutInflater().inflate(R.layout.dialog_edittext, null);
         final EditText editText = (EditText) content.findViewById(R.id.edittext);
+        // No prediction in soft keyboard mode. TODO: Create a better way to disable prediction
+        editText.setInputType(InputType.TYPE_CLASS_TEXT 
+                | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
         
         return new AlertDialog.Builder(this)
                 .setTitle(R.string.user_dict_settings_add_dialog_title)
diff --git a/src/com/android/settings/battery_history/BatteryHistory.java b/src/com/android/settings/battery_history/BatteryHistory.java
index 4265ac6..dcf6cbf 100644
--- a/src/com/android/settings/battery_history/BatteryHistory.java
+++ b/src/com/android/settings/battery_history/BatteryHistory.java
@@ -63,8 +63,8 @@
     private static final int NETWORK_USAGE = 1;
     private static final int GPS_USAGE = 2;
     private static final int SENSOR_USAGE = 3;
-    private static final int WAKE_LOCKS = 4;
-    private static final int SCREEN_ON = 5;
+    private static final int WAKELOCK_USAGE = 4;
+    private static final int MISC_USAGE = 5;
 
     // Must be in sync with the values in res/values/array.xml (id battery_history_which_spinner)
     private static final int UNPLUGGED = 0;
@@ -83,9 +83,10 @@
     private List<SensorUsage> mSensorUsage = new ArrayList<SensorUsage>();
     private List<SensorUsage> mGpsUsage = new ArrayList<SensorUsage>();
     private List<WakelockUsage> mWakelockUsage = new ArrayList<WakelockUsage>();
+    private List<MiscUsage> mMiscUsage = new ArrayList<MiscUsage>();
     
     private boolean mHaveCpuUsage, mHaveNetworkUsage, mHaveSensorUsage,
-            mHaveWakelockUsage, mHaveScreenOnTime;
+            mHaveWakelockUsage, mHaveMiscUsage;
     
     private LinearLayout mGraphLayout;
     private LinearLayout mTextLayout;
@@ -150,6 +151,10 @@
         public abstract double[] getValues();
         public abstract void getInfo(StringBuilder info);
         
+        public double getMaxValue() {
+            return -Double.MAX_VALUE;            
+        }
+        
         public int compareTo(Graphable o) {
             double t = getSortValue();
             double ot = o.getSortValue();
@@ -209,9 +214,11 @@
     class CpuUsage extends Graphable {
         String mProcess;
         double[] mUsage;
+        double mTotalRuntime;
         long mStarts;
         
-        public CpuUsage(int uid, String process, long userTime, long systemTime, long starts) {
+        public CpuUsage(int uid, String process, long userTime, long systemTime,
+                long starts, long totalRuntime) {
             getNameForUid(uid);
             mProcess = process;
             PackageManager pm = BatteryHistory.this.getPackageManager();
@@ -220,6 +227,7 @@
             
             mUsage[0] = userTime;
             mUsage[1] = userTime + systemTime;
+            mTotalRuntime = totalRuntime;
             mStarts = starts;
         }
         
@@ -235,6 +243,10 @@
             return mUsage;
         }
         
+        public double getMaxValue() {
+            return mTotalRuntime;            
+        }
+        
         public void getInfo(StringBuilder info) {
             info.append(getString(R.string.battery_history_cpu_usage, mProcess));
             info.append("\n\n");
@@ -306,13 +318,15 @@
     
     class SensorUsage extends Graphable {
         double[] mUsage;
+        double mTotalRealtime;
         int mCount;
         
-        public SensorUsage(int uid, long time, int count) {
+        public SensorUsage(int uid, long time, int count, long totalRealtime) {
             getNameForUid(uid);
             
             mUsage = new double[1];
             mUsage[0] = time;
+            mTotalRealtime = totalRealtime;
             
             mCount = count;
         }
@@ -329,6 +343,10 @@
             return mUsage;
         }
         
+        public double getMaxValue() {
+            return mTotalRealtime;            
+        }
+        
         public void getInfo(StringBuilder info) {
             info.append(getString(R.string.battery_history_sensor));
             info.append(mName);
@@ -342,13 +360,15 @@
     
     class WakelockUsage extends Graphable {
         double[] mUsage;
+        double mTotalRealtime;
         int mCount;
         
-        public WakelockUsage(int uid, long time, int count) {
+        public WakelockUsage(int uid, long time, int count, long totalRealtime) {
             getNameForUid(uid);
             
             mUsage = new double[1];
             mUsage[0] = time;
+            mTotalRealtime = totalRealtime;
             
             mCount = count;
         }
@@ -365,6 +385,10 @@
             return mUsage;
         }
         
+        public double getMaxValue() {
+            return mTotalRealtime;            
+        }
+        
         public void getInfo(StringBuilder info) {
             info.append(getString(R.string.battery_history_wakelock));
             info.append(mName);
@@ -375,35 +399,61 @@
         }
     }
     
+    class MiscUsage extends Graphable {
+        int mInfoLabelRes;
+        double[] mUsage;
+        double mTotalRealtime;
+        
+        public MiscUsage(String name, int infoLabelRes, long value,
+                long totalRealtime) {
+            mName = name;
+            
+            mInfoLabelRes = infoLabelRes;
+            
+            mUsage = new double[2];
+            mUsage[0] = value;
+            mTotalRealtime = totalRealtime;
+        }
+        
+        public String getLabel() {
+            return mName;
+        }
+        
+        public double getSortValue() {
+            return mUsage[1];
+        }
+        
+        public double[] getValues() {
+            return mUsage;
+        }
+        
+        public double getMaxValue() {
+            return mTotalRealtime;            
+        }
+        
+        public void getInfo(StringBuilder info) {
+            info.append(getString(mInfoLabelRes));
+            info.append(' ');
+            formatTime(mUsage[0], info);
+            info.append(" (");
+            info.append((mUsage[0]*100)/mTotalRealtime);
+            info.append("%)");
+        }
+    }
+    
     private List<? extends Graphable> getGraphRecords() {
         switch (mType) {
             case CPU_USAGE: return mCpuUsage;
             case NETWORK_USAGE : return mNetworkUsage;
             case SENSOR_USAGE: return mSensorUsage;
             case GPS_USAGE: return mGpsUsage;
-            case WAKE_LOCKS: return mWakelockUsage;
-            case SCREEN_ON: return null;
+            case WAKELOCK_USAGE: return mWakelockUsage;
+            case MISC_USAGE: return mMiscUsage;
             default:
                 return (List<? extends Graphable>) null; // TODO
         }
     }
     
-    private void displayScreenUsage() {
-        mMessageText.setVisibility(View.VISIBLE);
-        StringBuilder sb = new StringBuilder();
-        sb.append(getString(R.string.battery_history_screen_on));
-        sb.append("\n\n");
-        sb.append(getString(R.string.battery_history_screen_on_battery));
-        sb.append(' ');
-        formatTime((double) mStats.getBatteryScreenOnTime(), sb);
-        sb.append('\n');
-        sb.append(getString(R.string.battery_history_screen_on_plugged));
-        sb.append(' ');
-        formatTime((double) mStats.getPluggedScreenOnTime(), sb);
-        sb.append('\n');
-        mMessageText.setText(sb.toString());
-    }
-    
     private void displayGraph() {
         Log.i(TAG, "displayGraph");
 
@@ -415,17 +465,13 @@
             mButtons[i].setVisibility(View.INVISIBLE);
         }
         
-        if (mType == SCREEN_ON) {
-            displayScreenUsage();
-            return;
-        }
-        
         double maxValue = -Double.MAX_VALUE;
         
         List<? extends Graphable> records = getGraphRecords();
         for (Graphable g : records) {
             double[] values = g.getValues();
             maxValue = Math.max(maxValue, values[values.length - 1]);
+            maxValue = Math.max(maxValue, g.getMaxValue());
         }
         
         int[] colors = new int[2];
@@ -476,6 +522,9 @@
     private void processCpuUsage() {
         mCpuUsage.clear();
         
+        long uSecTime = SystemClock.uptimeMillis() * 1000;
+        final long uSecNow = mStats.computeBatteryUptime(uSecTime, mWhich) / 1000;
+        
         SparseArray<? extends Uid> uidStats = mStats.getUidStats();
         final int NU = uidStats.size();
         for (int iu = 0; iu < NU; iu++) {
@@ -493,7 +542,7 @@
 
                     if (userTime != 0 || systemTime != 0) {
                         mCpuUsage.add(new CpuUsage(u.getUid(), ent.getKey(),
-                                userTime, systemTime, starts));
+                                userTime, systemTime, starts, uSecNow));
                     }
                 }
             }
@@ -523,7 +572,7 @@
         mSensorUsage.clear();
         
         long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.getBatteryUptime(uSecTime);
+        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, mWhich) / 1000;
         
         SparseArray<? extends Uid> uidStats = mStats.getUidStats();
         final int NU = uidStats.size();
@@ -559,10 +608,10 @@
             }
             
             if (timeGps > 0) {
-                mGpsUsage.add(new SensorUsage(uid, timeGps, countGps));
+                mGpsUsage.add(new SensorUsage(uid, timeGps, countGps, uSecNow));
             }
             if (timeOther > 0) {
-                mSensorUsage.add(new SensorUsage(uid, timeOther, countOther));
+                mSensorUsage.add(new SensorUsage(uid, timeOther, countOther, uSecNow));
             }
         }
         
@@ -574,7 +623,7 @@
         mWakelockUsage.clear();
         
         long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.getBatteryUptime(uSecTime);
+        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, mWhich) / 1000;
         
         SparseArray<? extends Uid> uidStats = mStats.getUidStats();
         final int NU = uidStats.size();
@@ -600,15 +649,45 @@
             }
             
             if (time > 0) {
-                mWakelockUsage.add(new WakelockUsage(uid, time, count));
+                mWakelockUsage.add(new WakelockUsage(uid, time, count, uSecNow));
             }
         }
         
         Collections.sort(mWakelockUsage);
     }
     
-    private void processScreenOn() {
-        // Do nothing
+    private void processMiscUsage() {
+        mMiscUsage.clear();
+        
+        long rawRealtime = SystemClock.elapsedRealtime() * 1000;
+        final long batteryRealtime = mStats.getBatteryRealtime(rawRealtime);
+        final long whichRealtime = mStats.computeBatteryRealtime(rawRealtime, mWhich) / 1000;
+        
+        long time = mStats.computeBatteryUptime(SystemClock.uptimeMillis() * 1000, mWhich) / 1000;
+        if (time > 0) {
+            mMiscUsage.add(new MiscUsage(getString(
+                    R.string.battery_history_awake_label),
+                    R.string.battery_history_awake,
+                    time, whichRealtime)); 
+        }
+        
+        time = mStats.getScreenOnTime(batteryRealtime, mWhich) / 1000;
+        if (time > 0) {
+            mMiscUsage.add(new MiscUsage(getString(
+                    R.string.battery_history_screen_on_label),
+                    R.string.battery_history_screen_on,
+                    time, whichRealtime)); 
+        }
+        
+        time = mStats.getPhoneOnTime(batteryRealtime, mWhich) / 1000;
+        if (time > 0) {
+            mMiscUsage.add(new MiscUsage(getString(
+                    R.string.battery_history_phone_on_label),
+                    R.string.battery_history_phone_on,
+                    time, whichRealtime)); 
+        }
+        
+        Collections.sort(mMiscUsage);
     }
     
     private void collectStatistics() {
@@ -630,16 +709,16 @@
                 processSensorUsage();
             }
         }
-        if (mType == WAKE_LOCKS) {
+        if (mType == WAKELOCK_USAGE) {
             if (!mHaveWakelockUsage) {
                 mHaveWakelockUsage = true;
                 processWakelockUsage();
             }
         }
-        if (mType == SCREEN_ON) {
-            if (!mHaveScreenOnTime) {
-                mHaveScreenOnTime = true;
-                processScreenOn();
+        if (mType == MISC_USAGE) {
+            if (!mHaveMiscUsage) {
+                mHaveMiscUsage = true;
+                processMiscUsage();
             }
         }
     }
@@ -657,7 +736,7 @@
             //mStats.dumpLocked(new LogPrinter(Log.INFO, TAG));
             
             mHaveCpuUsage =  mHaveNetworkUsage =  mHaveSensorUsage
-                    = mHaveWakelockUsage = mHaveScreenOnTime = false;
+                    = mHaveWakelockUsage = mHaveMiscUsage = false;
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException:", e);
         }
@@ -686,26 +765,6 @@
         
         if (parent.equals(mTypeSpinner)) {
             mType = position;
-            switch (position) {
-                case CPU_USAGE:
-                    mWhichSpinner.setEnabled(true);
-                    break;
-                case NETWORK_USAGE:
-                    mWhichSpinner.setEnabled(true);
-                    break;
-                case GPS_USAGE:
-                    mWhichSpinner.setEnabled(true);
-                    break;
-                case SENSOR_USAGE:
-                    mWhichSpinner.setEnabled(true);
-                    break;
-                case WAKE_LOCKS:
-                    mWhichSpinner.setEnabled(true);
-                    break;
-                case SCREEN_ON:
-                    mWhichSpinner.setEnabled(false);
-                    break;
-            }
         } else if (parent.equals(mWhichSpinner)) {
             switch (position) {
                 case UNPLUGGED:
@@ -722,7 +781,7 @@
         
         if (oldWhich != mWhich) {
             mHaveCpuUsage =  mHaveNetworkUsage =  mHaveSensorUsage
-                    = mHaveWakelockUsage = mHaveScreenOnTime = false;
+                    = mHaveWakelockUsage = mHaveMiscUsage = false;
         }
         
         displayGraph();
@@ -766,6 +825,7 @@
         
         mWhichSpinner = (Spinner) findViewById(R.id.whichSpinner);
         mWhichSpinner.setOnItemSelectedListener(this);
+        mWhichSpinner.setEnabled(true);
         
         mButtons = new GraphableButton[8];
         mButtons[0] = (GraphableButton) findViewById(R.id.button0);
diff --git a/src/com/android/settings/bluetooth/BluetoothPinDialog.java b/src/com/android/settings/bluetooth/BluetoothPinDialog.java
index a8e7737..5e289f7 100644
--- a/src/com/android/settings/bluetooth/BluetoothPinDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPinDialog.java
@@ -157,11 +157,12 @@
         messageView.setText(getString(R.string.bluetooth_pairing_error_message,
                 mLocalManager.getLocalDeviceManager().getName(mAddress)));
         
-        mPinView.setEnabled(false);
+        mPinView.setVisibility(View.GONE);
         mPinView.clearFocus();
         mPinView.removeTextChangedListener(this);
-        
-        mAlert.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
+
+        mOkButton.setEnabled(true);
+        mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
     }
     
     private void onPair(String pin) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index f75e5f5..5adada3 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -253,6 +253,8 @@
         // we should start a scan
         if (bluetoothState == ExtendedBluetoothState.ENABLED) {
             mLocalManager.startScanning(false);
+        } else if (bluetoothState == ExtendedBluetoothState.DISABLED) {
+            mDeviceList.setProgress(false);
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
index b4a8ae0..7dd1b70 100644
--- a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
+++ b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
@@ -217,6 +217,9 @@
     private void refreshOnlineModePreference() {
         mOnlineModePreference.setChecked(mOnlineMode);
 
+        /* Gray out checkbox while connecting and disconnecting */
+        mOnlineModePreference.setEnabled(!mDevice.isBusy());
+
         /**
          * If the device is online, show status. Otherwise, show a summary that
          * describes what the checkbox does.
@@ -244,7 +247,10 @@
                 .getProfileManager(mManager, profile);
         
         int connectionStatus = profileManager.getConnectionStatus(address);
-        
+
+        /* Gray out checkbox while connecting and disconnecting */
+        profilePref.setEnabled(!mDevice.isBusy());
+
         profilePref.setSummary(getProfileSummary(profileManager, profile, address,
                 connectionStatus, mOnlineMode));
         
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
index 4fd708e..4671fac 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -23,6 +23,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
@@ -51,11 +52,13 @@
     private Context mContext;
     /** If a BT-related activity is in the foreground, this will be it. */
     private Activity mForegroundActivity;
-    
+    private AlertDialog mErrorDialog = null;
+
     private BluetoothDevice mManager;
 
     private LocalBluetoothDeviceManager mLocalDeviceManager;
     private BluetoothEventRedirector mEventRedirector;
+    private BluetoothA2dp mBluetoothA2dp;
     
     public static enum ExtendedBluetoothState { ENABLED, ENABLING, DISABLED, DISABLING, UNKNOWN }
     private ExtendedBluetoothState mState = ExtendedBluetoothState.UNKNOWN;
@@ -95,7 +98,9 @@
 
         mEventRedirector = new BluetoothEventRedirector(this);
         mEventRedirector.start();
-       
+
+        mBluetoothA2dp = new BluetoothA2dp(context);
+
         return true;
     }
     
@@ -112,6 +117,10 @@
     }
     
     public void setForegroundActivity(Activity activity) {
+        if (mErrorDialog != null) {
+            mErrorDialog.dismiss();
+            mErrorDialog = null;
+        }
         mForegroundActivity = activity;
     }
     
@@ -149,9 +158,23 @@
              */ 
             dispatchScanningStateChanged(true);
         } else {
-            
-            // Don't scan more than frequently than SCAN_EXPIRATION_MS, unless forced
-            if (!force && mLastScan + SCAN_EXPIRATION_MS > System.currentTimeMillis()) return;
+            if (!force) {
+                // Don't scan more than frequently than SCAN_EXPIRATION_MS,
+                // unless forced
+                if (mLastScan + SCAN_EXPIRATION_MS > System.currentTimeMillis()) {
+                    return;
+                }
+
+                // If we are playing music, don't scan unless forced.
+                List<String> sinks = mBluetoothA2dp.listConnectedSinks();
+                if (sinks != null) {
+                    for (String address : sinks) {
+                        if (mBluetoothA2dp.getSinkState(address) == BluetoothA2dp.STATE_PLAYING) {
+                            return;
+                        }
+                    }
+                }
+            }
             
             if (mManager.startDiscovery(true)) {
                 mLastScan = System.currentTimeMillis();
@@ -235,7 +258,7 @@
 
         if (mForegroundActivity != null) {
             // Need an activity context to show a dialog
-            AlertDialog ad = new AlertDialog.Builder(mForegroundActivity)
+            mErrorDialog = new AlertDialog.Builder(mForegroundActivity)
                 .setIcon(android.R.drawable.ic_dialog_alert)
                 .setTitle(titleResId)
                 .setMessage(message)
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index adfe88c..75a84b7 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -81,6 +81,8 @@
         intentFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SHARED);
         intentFilter.addAction(Intent.ACTION_MEDIA_BAD_REMOVAL);
+        intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTABLE);
+        intentFilter.addAction(Intent.ACTION_MEDIA_NOFS);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_STARTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
         intentFilter.addDataScheme("file");
diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index 54aab4b..323d5c7 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -95,6 +95,7 @@
         if (validChannelCounts == null) {
             Toast.makeText(this, R.string.wifi_setting_num_channels_error,
                            Toast.LENGTH_SHORT).show();
+            pref.setEnabled(false);
             return;
         }
         String[] entries = new String[validChannelCounts.length];
@@ -107,6 +108,7 @@
         }
         pref.setEntries(entries);
         pref.setEntryValues(entryValues);
+        pref.setEnabled(true);
         int numChannels = wifiManager.getNumAllowedChannels();
         if (numChannels >= 0) {
             pref.setValue(String.valueOf(numChannels));