auto import from //branches/cupcake/...@131421

11 files changed, 258 insertions, 1447 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 318e0b0..2368345 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -479,7 +479,7 @@
 
         <activity android:name="GadgetPickActivity" android:label="@string/gadget_picker_title">
             <intent-filter>
-                <action android:name="android.gadget.action.PICK_GADGET" />
+                <action android:name="android.gadget.action.GADGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
diff --git a/res/drawable/ic_menu_filter_settings.png b/res/drawable/ic_menu_filter_settings.png
new file mode 100755
index 0000000..7be883a
--- /dev/null
+++ b/res/drawable/ic_menu_filter_settings.png
diff --git a/res/layout/compute_sizes.xml b/res/layout/compute_sizes.xml
index bba8c63..1c8e966 100755
--- a/res/layout/compute_sizes.xml
+++ b/res/layout/compute_sizes.xml
@@ -20,19 +20,17 @@
     android:layout_height="fill_parent">
     <ListView 
         android:id="@android:id/list"
-        android:layout_weight="1"
         android:drawSelectorOnTop="false"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-    </ListView>
-    <TextView android:id="@android:id/empty"
+        android:layout_height="wrap_content" />
+    <TextView android:id="@+id/empty_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
         android:paddingLeft="20dip"
         android:paddingTop="5dip"
         android:text="@string/empty_list_msg"
-        android:textSize="15sp" />
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 </LinearLayout>
 
 
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index 0f6d3c3..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,1234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for device_info_default (7590614823249081756) -->
-    <skip />
-    <!-- no translation found for device_info_uptime (5770997070401578853) -->
-    <skip />
-    <!-- no translation found for device_info_awaketime (8786872485906712469) -->
-    <skip />
-    <!-- no translation found for device_info_asleeptime (7521071877583454145) -->
-    <skip />
-    <!-- no translation found for turn_on_radio (5921500147111366100) -->
-    <skip />
-    <!-- no translation found for turn_off_radio (8265991390836235521) -->
-    <skip />
-    <!-- no translation found for turn_on_qxdm (1929680250960586568) -->
-    <skip />
-    <!-- no translation found for turn_off_qxdm (2231700509067037981) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_viewADN (6360358040101027165) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_viewFDN (1156525488415146391) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_viewSDN (1621957874826137326) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_getPDP (5262139039274516177) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_enableData (7421444646018525501) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_disableData (747895994197436038) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_enableDataOnBoot (1926825935390738605) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_disableDataOnBoot (1229911918312837466) -->
-    <skip />
-    <!-- no translation found for radioInfo_service_in (5924630304105370132) -->
-    <skip />
-    <!-- no translation found for radioInfo_service_out (8851866705716243370) -->
-    <skip />
-    <!-- no translation found for radioInfo_service_emergency (3716022424799582775) -->
-    <skip />
-    <!-- no translation found for radioInfo_service_off (1327997868238966135) -->
-    <skip />
-    <!-- no translation found for radioInfo_roaming_in (500733867700442877) -->
-    <skip />
-    <!-- no translation found for radioInfo_roaming_not (6396563258833262032) -->
-    <skip />
-    <!-- no translation found for radioInfo_phone_idle (1313192484166377407) -->
-    <skip />
-    <!-- no translation found for radioInfo_phone_ringing (3719782771670214311) -->
-    <skip />
-    <!-- no translation found for radioInfo_phone_offhook (8240719545096222282) -->
-    <skip />
-    <!-- no translation found for radioInfo_data_disconnected (2529875822215485897) -->
-    <skip />
-    <!-- no translation found for radioInfo_data_connecting (4072774006290747959) -->
-    <skip />
-    <!-- no translation found for radioInfo_data_connected (3226955374690346958) -->
-    <skip />
-    <!-- no translation found for radioInfo_data_suspended (4953150687356763202) -->
-    <skip />
-    <!-- no translation found for radioInfo_unknown (1459640470009191283) -->
-    <skip />
-    <!-- no translation found for radioInfo_display_packets (6240096759326286933) -->
-    <skip />
-    <!-- no translation found for radioInfo_display_bytes (2316664594612332324) -->
-    <skip />
-    <!-- no translation found for radioInfo_display_dbm (5976249140663971321) -->
-    <skip />
-    <!-- no translation found for radioInfo_display_asu (4744317576791439328) -->
-    <skip />
-    <!-- no translation found for radioInfo_lac (9132851392756929560) -->
-    <skip />
-    <!-- no translation found for radioInfo_cid (8104441740986410116) -->
-    <skip />
-    <!-- no translation found for sdcard_unmount (4883209407806765776) -->
-    <skip />
-    <!-- no translation found for small_font (8358552488649514689) -->
-    <skip />
-    <!-- no translation found for medium_font (6883565794450338865) -->
-    <skip />
-    <!-- no translation found for large_font (4017618214361207193) -->
-    <skip />
-    <!-- no translation found for font_size_save (4680809224019179332) -->
-    <skip />
-    <!-- no translation found for sdcard_setting (7947032805424916049) -->
-    <skip />
-    <!-- no translation found for screen_off_timeout_label (3108465509533969105) -->
-    <skip />
-    <!-- no translation found for stay_on (5096027063517994119) -->
-    <skip />
-    <!-- no translation found for app_launcher_newView_text (2571672805191261300) -->
-    <skip />
-    <!-- no translation found for battery_info_status_label (7241771617541550021) -->
-    <skip />
-    <!-- no translation found for battery_info_scale_label (909568629374595124) -->
-    <skip />
-    <!-- no translation found for battery_info_level_label (2159203680331429485) -->
-    <skip />
-    <!-- no translation found for battery_info_health_label (5980664882115222930) -->
-    <skip />
-    <!-- no translation found for battery_info_technology_label (6228148669526755511) -->
-    <skip />
-    <!-- no translation found for battery_info_voltage_label (365003754672592412) -->
-    <skip />
-    <!-- no translation found for battery_info_voltage_units (8263071212648651338) -->
-    <skip />
-    <!-- no translation found for battery_info_temperature_label (7870244240851501404) -->
-    <skip />
-    <!-- no translation found for battery_info_temperature_units (7487929303685158981) -->
-    <skip />
-    <!-- no translation found for battery_info_uptime (1195623257533912354) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_battery (1529944627925423756) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_plugged (7272044960586959459) -->
-    <skip />
-    <!-- no translation found for battery_info_screen_on (832651425042656482) -->
-    <skip />
-    <!-- no translation found for battery_info_status_unknown (7415613412429160329) -->
-    <skip />
-    <!-- no translation found for battery_info_status_charging (8335298083353102727) -->
-    <skip />
-    <!-- no translation found for battery_info_status_charging_ac (1872629416053266802) -->
-    <skip />
-    <!-- no translation found for battery_info_status_charging_usb (4168539986397505310) -->
-    <skip />
-    <!-- no translation found for battery_info_status_discharging (4135855918830635792) -->
-    <skip />
-    <!-- no translation found for battery_info_status_not_charging (6393478667336118628) -->
-    <skip />
-    <!-- no translation found for battery_info_status_full (1825476891715419962) -->
-    <skip />
-    <!-- no translation found for battery_info_health_unknown (6950446031686941336) -->
-    <skip />
-    <!-- no translation found for battery_info_health_good (1730818926670939022) -->
-    <skip />
-    <!-- no translation found for battery_info_health_overheat (2159805591547843144) -->
-    <skip />
-    <!-- no translation found for battery_info_health_dead (1685986976493052835) -->
-    <skip />
-    <!-- no translation found for battery_info_health_over_voltage (3071909274422372159) -->
-    <skip />
-    <!-- no translation found for battery_info_health_unspecified_failure (6654089753274800002) -->
-    <skip />
-    <!-- no translation found for bluetooth (5458557266931413390) -->
-    <skip />
-    <!-- no translation found for bluetooth_stopping (2884449642912216721) -->
-    <skip />
-    <!-- no translation found for bluetooth_disabled (1391447030022958043) -->
-    <skip />
-    <!-- no translation found for bluetooth_enabled (5765634385322070565) -->
-    <skip />
-    <!-- no translation found for bluetooth_enabling (2387811926440795477) -->
-    <skip />
-    <!-- no translation found for bluetooth_visibility (7070140108792119698) -->
-    <skip />
-    <!-- no translation found for bluetooth_is_discoverable (8979781589253468104) -->
-    <skip />
-    <!-- no translation found for bluetooth_not_discoverable (4136294765906418294) -->
-    <skip />
-    <!-- no translation found for bluetooth_devices (2263213941869967836) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_name (6673408408534978327) -->
-    <skip />
-    <!-- no translation found for bluetooth_name_not_set (3250022629948561003) -->
-    <skip />
-    <!-- no translation found for bluetooth_scan_for_devices (6460816609454316693) -->
-    <skip />
-    <!-- no translation found for bluetooth_clear_list (6618471329960568682) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect_blank (6129414878545273731) -->
-    <skip />
-    <!-- no translation found for bluetooth_connected (7380272173205834342) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnected (779512372559332317) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnecting (613305857810977890) -->
-    <skip />
-    <!-- no translation found for bluetooth_connecting (424814598663613104) -->
-    <skip />
-    <!-- no translation found for bluetooth_unknown (5984480705609238684) -->
-    <skip />
-    <!-- no translation found for bluetooth_not_connected (1000422792621268295) -->
-    <skip />
-    <!-- no translation found for bluetooth_failed_to_enable (10261849074413402) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing (8284273555047880444) -->
-    <skip />
-    <!-- no translation found for failed_to_pair (5265027255173301781) -->
-    <skip />
-    <!-- no translation found for failed_to_connect (1409075183242262956) -->
-    <skip />
-    <!-- no translation found for bluetooth_paired (5011854699437682723) -->
-    <skip />
-    <!-- no translation found for bluetooth_paired_not_nearby (2890021978719716438) -->
-    <skip />
-    <!-- no translation found for bluetooth_device (4077191291193332167) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnect (4070053533691322466) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect (6123567524009555372) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair (6786377316984999718) -->
-    <skip />
-    <!-- no translation found for bluetooth_pair (6433088623778842494) -->
-    <skip />
-    <!-- no translation found for progress_scanning (7119295261222935963) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_ticker (6269529534945974964) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_title (3790273649365187417) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_message (3713615470961259613) -->
-    <skip />
-    <!-- no translation found for date_and_time (7561144940603232653) -->
-    <skip />
-    <!-- no translation found for date_time_12_hour_sample (3346099183513673921) -->
-    <skip />
-    <!-- no translation found for date_time_24_hour_sample (2930431568836213699) -->
-    <skip />
-    <!-- no translation found for choose_timezone (5417013900989552917) -->
-    <skip />
-    <!-- no translation found for display_preview_label (165196289151559072) -->
-    <skip />
-    <!-- no translation found for display_font_size_label (6263623549052165912) -->
-    <skip />
-    <!-- no translation found for intent_sender_data_label (1882888392709072340) -->
-    <skip />
-    <!-- no translation found for intent_sender_sendbroadcast_text (6655878781657210463) -->
-    <skip />
-    <!-- no translation found for intent_sender_action_label (5488427871152834830) -->
-    <skip />
-    <!-- no translation found for intent_sender_startactivity_text (7612120772998972749) -->
-    <skip />
-    <!-- no translation found for intent_sender_resource_label (2764211719287875308) -->
-    <skip />
-    <!-- no translation found for intent_sender_account_label (5895797962518760165) -->
-    <skip />
-    <!-- no translation found for keyguard_pw_mod_text (4628095162019973491) -->
-    <skip />
-    <!-- no translation found for keyguard_pin_mod_text (3916277193756089917) -->
-    <skip />
-    <!-- no translation found for keyguard_label (6105620776700897730) -->
-    <skip />
-    <!-- no translation found for keyguard_sim_pin_label (3165230979848342096) -->
-    <skip />
-    <!-- no translation found for keyguard_password_old_password_error_text (7825167921425875782) -->
-    <skip />
-    <!-- no translation found for keyguard_password_button_text (5583216611767587916) -->
-    <skip />
-    <!-- no translation found for keyguard_password_confirm_new_label (3049924245089700462) -->
-    <skip />
-    <!-- no translation found for keyguard_password_new_label (6886321134396839613) -->
-    <skip />
-    <!-- no translation found for keyguard_password_old_label (2625226322160389164) -->
-    <skip />
-    <!-- no translation found for keyguard_password_mismatch_error_text (5590439742407960684) -->
-    <skip />
-    <!-- no translation found for proxy_clear_text (7462018343861464800) -->
-    <skip />
-    <!-- no translation found for proxy_port_label (454764249950408469) -->
-    <skip />
-    <!-- no translation found for proxy_defaultView_text (477956555946955188) -->
-    <skip />
-    <!-- no translation found for proxy_action_text (7237648202287106053) -->
-    <skip />
-    <!-- no translation found for proxy_hostname_label (8172724402202502926) -->
-    <skip />
-    <!-- no translation found for proxy_error (2368838777443712514) -->
-    <skip />
-    <!-- no translation found for proxy_error_dismiss (1009576670609260537) -->
-    <skip />
-    <!-- no translation found for proxy_error_invalid_host (5818723835453265444) -->
-    <skip />
-    <!-- no translation found for proxy_error_empty_port (738670302600971696) -->
-    <skip />
-    <!-- no translation found for proxy_error_empty_host_set_port (3522768877312466087) -->
-    <skip />
-    <!-- no translation found for proxy_error_invalid_port (5852740817449746242) -->
-    <skip />
-    <!-- no translation found for radio_info_signal_location_label (6790461877981061839) -->
-    <skip />
-    <!-- no translation found for radio_info_neighboring_location_label (5882264988461015003) -->
-    <skip />
-    <!-- no translation found for radio_info_data_attempts_label (5718604146991711306) -->
-    <skip />
-    <!-- no translation found for radio_info_imsi_label (2317524657274819091) -->
-    <skip />
-    <!-- no translation found for radio_info_gprs_service_label (5420684247059811667) -->
-    <skip />
-    <!-- no translation found for radio_info_roaming_label (1523999234094211876) -->
-    <skip />
-    <!-- no translation found for radio_info_imei_label (7478845477154345609) -->
-    <skip />
-    <!-- no translation found for radio_info_call_redirect_label (9152188915373483603) -->
-    <skip />
-    <!-- no translation found for radio_info_ppp_resets_label (7827917501324472951) -->
-    <skip />
-    <!-- no translation found for radio_info_gsm_disconnects_label (50196516231035865) -->
-    <skip />
-    <!-- no translation found for radio_info_current_network_label (7900537487294471382) -->
-    <skip />
-    <!-- no translation found for radio_info_data_successes_label (7535159054935678976) -->
-    <skip />
-    <!-- no translation found for radio_info_ppp_received_label (4691560024942688416) -->
-    <skip />
-    <!-- no translation found for radio_info_gsm_service_label (4136951864496199626) -->
-    <skip />
-    <!-- no translation found for radio_info_signal_strength_label (5563094068800111446) -->
-    <skip />
-    <!-- no translation found for radio_info_call_status_label (1954322409156881789) -->
-    <skip />
-    <!-- no translation found for radio_info_ppp_sent_label (4787832417770220813) -->
-    <skip />
-    <!-- no translation found for radio_info_radio_resets_label (6419704529083057732) -->
-    <skip />
-    <!-- no translation found for radio_info_message_waiting_label (3693034295049688916) -->
-    <skip />
-    <!-- no translation found for radio_info_phone_number_label (1169287873766331522) -->
-    <skip />
-    <!-- no translation found for radio_info_band_mode_label (492995374341164385) -->
-    <skip />
-    <!-- no translation found for radio_info_network_type_label (6136190660604370025) -->
-    <skip />
-    <!-- no translation found for radio_info_set_perferred_label (7678318715915926899) -->
-    <skip />
-    <!-- no translation found for radio_info_ping_ipaddr (7229811664688502621) -->
-    <skip />
-    <!-- no translation found for radio_info_ping_hostname (7817617877155199848) -->
-    <skip />
-    <!-- no translation found for radio_info_http_client_test (5100483824350561339) -->
-    <skip />
-    <!-- no translation found for radio_info_toggle_ciph_label (2705975697585878388) -->
-    <skip />
-    <!-- no translation found for ping_test_label (99396772665008247) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_label (6577522217730406517) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_update_label (6471155265532972448) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_refresh_label (4334057389927982364) -->
-    <skip />
-    <!-- no translation found for band_mode_title (7821227842056223251) -->
-    <skip />
-    <!-- no translation found for band_mode_loading (410937385710103955) -->
-    <skip />
-    <!-- no translation found for band_mode_set (8014088359589034048) -->
-    <skip />
-    <!-- no translation found for band_mode_failed (7344139594454779293) -->
-    <skip />
-    <!-- no translation found for band_mode_succeeded (6743326367601528579) -->
-    <skip />
-    <!-- no translation found for ringer_volume_ringer_mode_label (1267680012888226403) -->
-    <skip />
-    <!-- no translation found for ringer_volume_screen_increasing_text (5641107274996825316) -->
-    <skip />
-    <!-- no translation found for ringer_volume_ringtone_label (8507276140935496895) -->
-    <skip />
-    <!-- no translation found for ringer_volume_instructions (7430796981440362113) -->
-    <skip />
-    <!-- no translation found for sdcard_changes_instructions (7539994899295940230) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_screen_mass_storage_text (2709793645616209242) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_total_bytes_label (4695007104428377476) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_not_present_status (8273854904691436051) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_available_bytes_label (8728724492013578100) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_mass_storage_status (5462257162856618607) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_unmounted_status (4993156749793936182) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_bad_removal_status (6987436040423897460) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_used_bytes_label (1097524397345356686) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_scanning_status (7123981757360169583) -->
-    <skip />
-    <!-- no translation found for sdcard_settings_read_only_status (4474146266994176505) -->
-    <skip />
-    <!-- no translation found for sdcard_removal_alert_title (5360030372146492494) -->
-    <skip />
-    <!-- no translation found for sdcard_unmountable_alert_title (2457327813571875941) -->
-    <skip />
-    <!-- no translation found for telephony_user_label (3662067259022076855) -->
-    <skip />
-    <!-- no translation found for telephony_server_label (2958905930463255443) -->
-    <skip />
-    <!-- no translation found for telephony_name_label (3239206851237697815) -->
-    <skip />
-    <!-- no translation found for telephony_mmsc_label (3129572752790593204) -->
-    <skip />
-    <!-- no translation found for telephony_apn_label (1269355797700328878) -->
-    <skip />
-    <!-- no translation found for telephony_mcc_label (2358690342050148082) -->
-    <skip />
-    <!-- no translation found for telephony_port_label (1664109599163228850) -->
-    <skip />
-    <!-- no translation found for telephony_password_label (2790168704218175016) -->
-    <skip />
-    <!-- no translation found for telephony_proxy_label (4480701121030721391) -->
-    <skip />
-    <!-- no translation found for telephony_mnc_label (6250035410010841498) -->
-    <skip />
-    <!-- no translation found for telephony_mmsproxy_label (5927157452625472941) -->
-    <skip />
-    <!-- no translation found for telephony_mmsport_label (151112465984611435) -->
-    <skip />
-    <!-- no translation found for next_label (485332588250947062) -->
-    <skip />
-    <!-- no translation found for language_picker_title (4327847825278760846) -->
-    <skip />
-    <!-- no translation found for select_your_language (9081963472187973531) -->
-    <skip />
-    <!-- no translation found for activity_picker_label (2380525463987566218) -->
-    <skip />
-    <!-- no translation found for device_info_label (7570393762255800528) -->
-    <skip />
-    <!-- no translation found for battery_info_label (4226476641445884464) -->
-    <skip />
-    <!-- no translation found for display_label (5332548614157902929) -->
-    <skip />
-    <!-- no translation found for phone_info_label (4489149928836976370) -->
-    <skip />
-    <!-- no translation found for sd_card_settings_label (4859619309953284243) -->
-    <skip />
-    <!-- no translation found for proxy_settings_label (7309754884369094752) -->
-    <skip />
-    <!-- no translation found for cancel (5496501778130330179) -->
-    <skip />
-    <!-- no translation found for settings_label (5215706799907405364) -->
-    <skip />
-    <!-- no translation found for airplane_mode (728128729487272521) -->
-    <skip />
-    <!-- no translation found for airplane_mode_summary (3500557633417506553) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_on (1243134862683209663) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_off (2291183932542256190) -->
-    <skip />
-    <!-- no translation found for radio_controls_title (4981652151494753702) -->
-    <skip />
-    <!-- no translation found for radio_controls_summary (9105526969569292926) -->
-    <skip />
-    <!-- no translation found for date_and_time_settings_title (7496498492273417635) -->
-    <skip />
-    <!-- no translation found for date_and_time_settings_summary (3489093199543794055) -->
-    <skip />
-    <!-- no translation found for date_time_auto (2362417333033542761) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOn (6001598633410342344) -->
-    <skip />
-    <!-- no translation found for date_time_auto_summaryOff (7997440952829716343) -->
-    <skip />
-    <!-- no translation found for date_time_24hour (7673898630734082066) -->
-    <skip />
-    <!-- no translation found for date_time_set_time (3035124335707824178) -->
-    <skip />
-    <!-- no translation found for date_time_set_timezone (8157539696840488255) -->
-    <skip />
-    <!-- no translation found for date_time_set_date (5796511221096156740) -->
-    <skip />
-    <!-- no translation found for date_time_date_format (8767730290447762594) -->
-    <skip />
-    <!-- no translation found for zone_list_menu_sort_alphabetically (8983103881342552870) -->
-    <skip />
-    <!-- no translation found for zone_list_menu_sort_by_timezone (7025442915093990469) -->
-    <skip />
-    <!-- no translation found for security_settings_title (969550777120624897) -->
-    <skip />
-    <!-- no translation found for security_settings_summary (3202445632951595923) -->
-    <skip />
-    <!-- no translation found for security_passwords_title (4466520735598079063) -->
-    <skip />
-    <!-- no translation found for bluetooth_quick_toggle_title (7390054857098148377) -->
-    <skip />
-    <!-- no translation found for bluetooth_quick_toggle_summary (2292894901949724405) -->
-    <skip />
-    <!-- no translation found for bluetooth_settings (1545097653816106117) -->
-    <skip />
-    <!-- no translation found for bluetooth_settings_title (7436154842447736508) -->
-    <skip />
-    <!-- no translation found for bluetooth_settings_summary (1419697742707330821) -->
-    <skip />
-    <!-- no translation found for bluetooth_pin_entry (7140440689122855541) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_info (726888105035847276) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing_msg (421984108945447804) -->
-    <skip />
-    <!-- no translation found for bluetooth_enter_pin_msg (5283213895861482149) -->
-    <skip />
-    <!-- no translation found for bluetooth_new_data (4048633302322349191) -->
-    <skip />
-    <!-- no translation found for bluetooth_new_data_confirm (6572723618484710293) -->
-    <skip />
-    <!-- no translation found for bluetooth_new_data_cancel (6401813497420912873) -->
-    <skip />
-    <!-- no translation found for bluetooth_scan_for_new_devices (2016453591198271840) -->
-    <skip />
-    <!-- no translation found for bluetooth_discoverability_panel_title (3088687647065413091) -->
-    <skip />
-    <!-- no translation found for bluetooth_discoverable (6321742881547460353) -->
-    <skip />
-    <!-- no translation found for bluetooth_connectable (6460916475945857842) -->
-    <skip />
-    <!-- no translation found for bluetooth_neither (7180764615407592566) -->
-    <skip />
-    <!-- no translation found for bluetooth_preference_scan_title (5457824526570506576) -->
-    <skip />
-    <!-- no translation found for bluetooth_preference_scan_summary (4169248439102381141) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect (1360133741981139570) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect (3848550418295778426) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_pair_connect (3526057462723016574) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_unpair (1842004154350000288) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect_unpair (302606151874724466) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect_advanced (5004355397163127842) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect_specific_profiles_title (8557599374974072579) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_a2dp (6848174297822591204) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_headset (8660680578951214915) -->
-    <skip />
-    <!-- no translation found for wifi (1814330175745622683) -->
-    <skip />
-    <!-- no translation found for wifi_quick_toggle_title (4404851801229148146) -->
-    <skip />
-    <!-- no translation found for wifi_quick_toggle_summary (5254705029759236850) -->
-    <skip />
-    <!-- no translation found for wifi_settings (8327330966261092159) -->
-    <skip />
-    <!-- no translation found for wifi_settings_category (610287013958209636) -->
-    <skip />
-    <!-- no translation found for wifi_settings_summary (8789964612748859011) -->
-    <skip />
-    <!-- no translation found for forget_network (5055146656395940343) -->
-    <skip />
-    <!-- no translation found for wifi_status (4374358089273446404) -->
-    <skip />
-    <!-- no translation found for wifi_link_speed (8766462457818203791) -->
-    <skip />
-    <!-- no translation found for wifi_signal_3 (1264702582845283580) -->
-    <skip />
-    <!-- no translation found for wifi_signal_2 (3765197678751351272) -->
-    <skip />
-    <!-- no translation found for wifi_signal_1 (3469786868912545422) -->
-    <skip />
-    <!-- no translation found for wifi_signal_0 (7285670709111185231) -->
-    <skip />
-    <!-- no translation found for security (5693579233939508487) -->
-    <skip />
-    <!-- no translation found for wifi_security_open (6529463996240023139) -->
-    <skip />
-    <!-- no translation found for wifi_security_wep (8543279149057388909) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa (7229647924366572707) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa2 (641020427516679969) -->
-    <skip />
-    <!-- no translation found for wifi_security_unknown (7700764937580224930) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_open (7105261201983314526) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (2018232984976185738) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (7240649761750328761) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (5470387821577814216) -->
-    <skip />
-    <!-- no translation found for ip_address (4529429379837050044) -->
-    <skip />
-    <!-- no translation found for signal (2632692872631550847) -->
-    <skip />
-    <!-- no translation found for wifi_starting (380585178092358776) -->
-    <skip />
-    <!-- no translation found for wifi_stopping (1130828572786743854) -->
-    <skip />
-    <!-- no translation found for wifi_error (7223451684597210919) -->
-    <skip />
-    <!-- no translation found for error_starting (7901473970530638438) -->
-    <skip />
-    <!-- no translation found for error_stopping (6119744781517748022) -->
-    <skip />
-    <!-- no translation found for error_scanning (8959523523794779868) -->
-    <skip />
-    <!-- no translation found for error_connecting (1510805861562560751) -->
-    <skip />
-    <!-- no translation found for error_saving (596104681410934823) -->
-    <skip />
-    <!-- no translation found for connect (1116879604374989661) -->
-    <skip />
-    <!-- no translation found for connect_to_blank (6054013287161999519) -->
-    <skip />
-    <!-- no translation found for please_type_passphrase (5613230660950935320) -->
-    <skip />
-    <!-- no translation found for please_type_hex_key (3792966437690051423) -->
-    <skip />
-    <!-- no translation found for wifi_show_password (2142204324333077532) -->
-    <skip />
-    <!-- no translation found for scan_wifi (3192234741001559529) -->
-    <skip />
-    <!-- no translation found for summary_not_in_range (396994203639865459) -->
-    <skip />
-    <!-- no translation found for summary_remembered (7032231120124870464) -->
-    <skip />
-    <!-- no translation found for summary_connection_failed (5466501123715222542) -->
-    <skip />
-    <!-- no translation found for wifi_access_points (6047681549878678453) -->
-    <skip />
-    <!-- no translation found for wifi_type_ssid (4389276980911820577) -->
-    <skip />
-    <!-- no translation found for wifi_security (8115513846744543151) -->
-    <skip />
-    <!-- no translation found for wifi_save_config (1041957548332322297) -->
-    <skip />
-    <!-- no translation found for wifi_password_unchanged (5583782979192657008) -->
-    <skip />
-    <!-- no translation found for wifi_add_other_network (914072465709281633) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks (3091942233631075516) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks_summary (1793737931132127488) -->
-    <skip />
-    <!-- no translation found for wifi_password_incorrect_error (8656138222468900361) -->
-    <skip />
-    <!-- no translation found for wifi_generic_connection_error (4414845075108763948) -->
-    <skip />
-    <!-- no translation found for wifi_menu_advanced (7729886219986221918) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_titlebar (6646153875184353089) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_save (5525488681356054899) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_cancel (4123436217014637229) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_invalid_ip (1648124374575025870) -->
-    <skip />
-    <!-- no translation found for wifi_use_static_ip (4076793026334955338) -->
-    <skip />
-    <!-- no translation found for wifi_ip_address (6067958502872259392) -->
-    <skip />
-    <!-- no translation found for wifi_dns1 (7502077213876989613) -->
-    <skip />
-    <!-- no translation found for wifi_dns2 (3296825469895827273) -->
-    <skip />
-    <!-- no translation found for wifi_gateway (393330487055540831) -->
-    <skip />
-    <!-- no translation found for wifi_netmask (6024777305439519433) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_connect (3348366738100644008) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_forget (5844111744505938081) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_change_password (7074463790535015442) -->
-    <skip />
-    <!-- no translation found for wifi_advanced_titlebar (7352048185262676955) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_title (4302664253747096207) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_summary (5137058932628594680) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_error (581404310349899492) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_channel_phrase (8341967925173918983) -->
-    <skip />
-    <!-- no translation found for fragment_status_scanning (2452501398802143084) -->
-    <skip />
-    <!-- no translation found for fragment_status_connecting (5455055928926778914) -->
-    <skip />
-    <!-- no translation found for fragment_status_authenticating (5975151429887814137) -->
-    <skip />
-    <!-- no translation found for fragment_status_obtaining_ip (8371541056156574137) -->
-    <skip />
-    <!-- no translation found for fragment_status_connected (7772649421228697676) -->
-    <skip />
-    <!-- no translation found for fragment_status_disconnecting (8051305438312488379) -->
-    <skip />
-    <!-- no translation found for fragment_status_disconnected (3290940773446552042) -->
-    <skip />
-    <!-- no translation found for fragment_status_failed (4964409385458293579) -->
-    <skip />
-    <!-- no translation found for status_scanning (3926342408784845610) -->
-    <skip />
-    <!-- no translation found for status_connecting (225048051419417871) -->
-    <skip />
-    <!-- no translation found for status_authenticating (4264747836549183098) -->
-    <skip />
-    <!-- no translation found for status_obtaining_ip (8073304022575470763) -->
-    <skip />
-    <!-- no translation found for status_connected (2715529156265923902) -->
-    <skip />
-    <!-- no translation found for status_disconnecting (1811735170177265186) -->
-    <skip />
-    <!-- no translation found for status_disconnected (1477066785918464530) -->
-    <skip />
-    <!-- no translation found for status_failed (1510040818386395715) -->
-    <skip />
-    <!-- no translation found for sound_and_display_settings (4749118288236939460) -->
-    <skip />
-    <!-- no translation found for sound_settings (2706184235211157339) -->
-    <skip />
-    <!-- no translation found for sound_and_display_settings_summary (3672623202659031178) -->
-    <skip />
-    <!-- no translation found for silent_mode_title (8688647037631448198) -->
-    <skip />
-    <!-- no translation found for silent_mode_summary (6135093989634963053) -->
-    <skip />
-    <!-- no translation found for ringtone_title (3146429644474380431) -->
-    <skip />
-    <!-- no translation found for ringtone_summary (1766080371183553822) -->
-    <skip />
-    <!-- no translation found for ring_volume_title (3239245366359256522) -->
-    <skip />
-    <!-- no translation found for ring_volume_summary (8107485240454889544) -->
-    <skip />
-    <!-- no translation found for vibrate_title (4376574310180696114) -->
-    <skip />
-    <!-- no translation found for vibrate_summary (6788068739601216797) -->
-    <skip />
-    <!-- no translation found for notification_sound_title (4775305251012747308) -->
-    <skip />
-    <!-- no translation found for notification_sound_summary (7617168477811163700) -->
-    <skip />
-    <!-- no translation found for notification_sound_dialog_title (7369825410219702421) -->
-    <skip />
-    <!-- no translation found for media_volume_title (1693540506432790482) -->
-    <skip />
-    <!-- no translation found for media_volume_summary (7399719776785079493) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (5173416183471867551) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_on (7206798183944836534) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_off (1555390648905350809) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_title (1955885794556255214) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_on (1491009278452582375) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_off (1932117674347216086) -->
-    <skip />
-    <!-- no translation found for sync_settings (5627573212478260990) -->
-    <skip />
-    <!-- no translation found for sync_settings_summary (2105151329390814783) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes (5404332736593108449) -->
-    <skip />
-    <!-- no translation found for sync_automatically (1757054007777364379) -->
-    <skip />
-    <!-- no translation found for sync_enabled (4881088906246650863) -->
-    <skip />
-    <!-- no translation found for sync_disabled (2619875735374209768) -->
-    <skip />
-    <!-- no translation found for sync_menu_sync_now (3780223798968952491) -->
-    <skip />
-    <!-- no translation found for sync_menu_sync_cancel (5977866540414760428) -->
-    <skip />
-    <!-- no translation found for sync_calendar (596997436997648960) -->
-    <skip />
-    <!-- no translation found for sync_contacts (4740241811440373346) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes_desc (4152554451720380120) -->
-    <skip />
-    <!-- no translation found for sync_really_delete (8529530859370540061) -->
-    <skip />
-    <!-- no translation found for sync_undo_deletes (5506677219430968015) -->
-    <skip />
-    <!-- no translation found for sync_do_nothing (8346666920786786758) -->
-    <skip />
-    <!-- no translation found for sync_is_failing (427555999473172925) -->
-    <skip />
-    <!-- no translation found for sync_plug (7544937220884084907) -->
-    <skip />
-    <!-- no translation found for display_settings (2055476596829366899) -->
-    <skip />
-    <!-- no translation found for animations_title (8735876378664711924) -->
-    <skip />
-    <!-- no translation found for animations_summary_on (4910047473170373768) -->
-    <skip />
-    <!-- no translation found for animations_summary_off (7454248311417075336) -->
-    <skip />
-    <!-- no translation found for brightness (7792602943961915646) -->
-    <skip />
-    <!-- no translation found for screen_timeout (8939204183998677539) -->
-    <skip />
-    <!-- no translation found for dim_screen (9146822367857660944) -->
-    <skip />
-    <!-- no translation found for sim_lock_settings (6543426308260152558) -->
-    <skip />
-    <!-- no translation found for sim_lock_settings_category (5039441655358781230) -->
-    <skip />
-    <!-- no translation found for sim_lock_settings_title (8010374003882925802) -->
-    <skip />
-    <!-- no translation found for sim_pin_toggle (7574412021981868256) -->
-    <skip />
-    <!-- no translation found for sim_lock_on (8138827066389889705) -->
-    <skip />
-    <!-- no translation found for sim_lock_off (5981077590897850416) -->
-    <skip />
-    <!-- no translation found for sim_pin_change (6346345741504768562) -->
-    <skip />
-    <!-- no translation found for sim_enter_pin (4472262228361846224) -->
-    <skip />
-    <!-- no translation found for sim_enable_sim_lock (1767414643085437650) -->
-    <skip />
-    <!-- no translation found for sim_disable_sim_lock (645505993827348391) -->
-    <skip />
-    <!-- no translation found for sim_enter_old (7066720880711460173) -->
-    <skip />
-    <!-- no translation found for sim_enter_new (5400506743942872294) -->
-    <skip />
-    <!-- no translation found for sim_reenter_new (3879209700314730223) -->
-    <skip />
-    <!-- no translation found for sim_change_pin (2931559944636266720) -->
-    <skip />
-    <!-- no translation found for sim_bad_pin (3448299105143686010) -->
-    <skip />
-    <!-- no translation found for sim_pins_dont_match (3311391861690022007) -->
-    <skip />
-    <!-- no translation found for sim_change_failed (296582980570404493) -->
-    <skip />
-    <!-- no translation found for sim_change_succeeded (5213849401095906667) -->
-    <skip />
-    <!-- no translation found for sim_lock_failed (5347551041374297429) -->
-    <skip />
-    <!-- no translation found for sim_enter_ok (1358372725362896701) -->
-    <skip />
-    <!-- no translation found for sim_enter_cancel (7631739323185806744) -->
-    <skip />
-    <!-- no translation found for device_info_settings (8859027767242680086) -->
-    <skip />
-    <!-- no translation found for system_update_settings_list_item_title (6730200310196695815) -->
-    <skip />
-    <!-- no translation found for system_update_settings_list_item_summary (6739352515982816664) -->
-    <skip />
-    <!-- no translation found for firmware_version (7819665654211702103) -->
-    <skip />
-    <!-- no translation found for model_number (4107796374489189882) -->
-    <skip />
-    <!-- no translation found for baseband_version (1650040574471474415) -->
-    <skip />
-    <!-- no translation found for kernel_version (55378504731737055) -->
-    <skip />
-    <!-- no translation found for build_number (1198654854394859525) -->
-    <skip />
-    <!-- no translation found for device_info_not_available (6218382614449625943) -->
-    <skip />
-    <!-- no translation found for device_status_activity_title (7855799759928692423) -->
-    <skip />
-    <!-- no translation found for device_status (2987561680068888482) -->
-    <skip />
-    <!-- no translation found for device_status_summary (1780544099238783522) -->
-    <skip />
-    <!-- no translation found for storage_settings_title (7861753874184164833) -->
-    <skip />
-    <!-- no translation found for storage_settings_summary (1416818376253802300) -->
-    <skip />
-    <!-- no translation found for status_number (4806660473653039727) -->
-    <skip />
-    <!-- no translation found for status_network_type (1161425700453834462) -->
-    <skip />
-    <!-- no translation found for status_data_state (8695034896805908780) -->
-    <skip />
-    <!-- no translation found for status_service_state (7070870512884685707) -->
-    <skip />
-    <!-- no translation found for status_signal_strength (1482993382046051601) -->
-    <skip />
-    <!-- no translation found for status_roaming (3315390849872980461) -->
-    <skip />
-    <!-- no translation found for status_operator (1056327385889326521) -->
-    <skip />
-    <!-- no translation found for status_wifi_mac_address (6992831729694423293) -->
-    <skip />
-    <!-- no translation found for status_bt_address (504373592762785867) -->
-    <skip />
-    <!-- no translation found for status_unavailable (6051510065892966154) -->
-    <skip />
-    <!-- no translation found for status_up_time (6098196556512905607) -->
-    <skip />
-    <!-- no translation found for status_awake_time (7049273600775745222) -->
-    <skip />
-    <!-- no translation found for internal_memory (7561409402817962159) -->
-    <skip />
-    <!-- no translation found for sd_memory (1795406535114313767) -->
-    <skip />
-    <!-- no translation found for memory_available (2899158225295363424) -->
-    <skip />
-    <!-- no translation found for memory_size (427803224818498885) -->
-    <skip />
-    <!-- no translation found for sd_eject (5921913949386442101) -->
-    <skip />
-    <!-- no translation found for sd_unavailable (8594217970053251031) -->
-    <skip />
-    <!-- no translation found for read_only (5208058402768070774) -->
-    <skip />
-    <!-- no translation found for battery_status_title (4908729478929871241) -->
-    <skip />
-    <!-- no translation found for battery_level_title (7696801820825704716) -->
-    <skip />
-    <!-- no translation found for apn_settings (7722988461663532083) -->
-    <skip />
-    <!-- no translation found for apn_edit (145450827773713132) -->
-    <skip />
-    <!-- no translation found for apn_not_set (1836736103685783041) -->
-    <skip />
-    <!-- no translation found for apn_name (5635523810193862271) -->
-    <skip />
-    <!-- no translation found for apn_apn (1405862057719498554) -->
-    <skip />
-    <!-- no translation found for apn_http_proxy (4783209622604526103) -->
-    <skip />
-    <!-- no translation found for apn_http_port (6467898443547323366) -->
-    <skip />
-    <!-- no translation found for apn_user (5401806939590692307) -->
-    <skip />
-    <!-- no translation found for apn_password (3912272151916346972) -->
-    <skip />
-    <!-- no translation found for apn_server (4178172695606191290) -->
-    <skip />
-    <!-- no translation found for apn_mmsc (4688710822514329323) -->
-    <skip />
-    <!-- no translation found for apn_mms_proxy (6319130324547259424) -->
-    <skip />
-    <!-- no translation found for apn_mms_port (4994975830339343926) -->
-    <skip />
-    <!-- no translation found for apn_mcc (4776172371424088609) -->
-    <skip />
-    <!-- no translation found for apn_mnc (6461836944090234319) -->
-    <skip />
-    <!-- no translation found for apn_type (2506383481268652319) -->
-    <skip />
-    <!-- no translation found for menu_delete (3312578247597762628) -->
-    <skip />
-    <!-- no translation found for menu_new (3302849393949232932) -->
-    <skip />
-    <!-- no translation found for menu_save (3541472751331191778) -->
-    <skip />
-    <!-- no translation found for menu_cancel (5119635160240047061) -->
-    <skip />
-    <!-- no translation found for error_title (5587090263536163777) -->
-    <skip />
-    <!-- no translation found for error_name_empty (8320983575802186669) -->
-    <skip />
-    <!-- no translation found for error_apn_empty (184981742259179404) -->
-    <skip />
-    <!-- no translation found for error_mcc_not3 (7059134831435281818) -->
-    <skip />
-    <!-- no translation found for error_mnc_not23 (8895747717145947670) -->
-    <skip />
-    <!-- no translation found for master_clear_title (932887860880075023) -->
-    <skip />
-    <!-- no translation found for master_clear_summary (2468534382451112879) -->
-    <skip />
-    <!-- no translation found for master_clear_desc (1022483980097013344) -->
-    <skip />
-    <!-- no translation found for master_clear_button_text (9137164244701534144) -->
-    <skip />
-    <!-- no translation found for master_clear_final_desc (316241813541136543) -->
-    <skip />
-    <!-- no translation found for master_clear_final_button_text (694363627766745199) -->
-    <skip />
-    <!-- no translation found for master_clear_gesture_prompt (1301991895870557434) -->
-    <skip />
-    <!-- no translation found for master_clear_gesture_explanation (598778956139377201) -->
-    <skip />
-    <!-- no translation found for master_clear_failed (8666435811265924625) -->
-    <skip />
-    <!-- no translation found for call_settings_title (1983111932504030578) -->
-    <skip />
-    <!-- no translation found for call_settings_summary (3446216896482844237) -->
-    <skip />
-    <!-- no translation found for network_settings_title (7989745255729576458) -->
-    <skip />
-    <!-- no translation found for network_settings_summary (8031949240036716110) -->
-    <skip />
-    <!-- no translation found for location_title (4501749309437121375) -->
-    <skip />
-    <!-- no translation found for location_network_based (3452214514389955422) -->
-    <skip />
-    <!-- no translation found for location_networks_disabled (7048471014395968941) -->
-    <skip />
-    <!-- no translation found for location_neighborhood_level (5315391444072434546) -->
-    <skip />
-    <!-- no translation found for location_gps (544098941752665022) -->
-    <skip />
-    <!-- no translation found for location_street_level (5804470409412760900) -->
-    <skip />
-    <!-- no translation found for location_gps_disabled (4004885356658024277) -->
-    <skip />
-    <!-- no translation found for about_settings (1468182090257585152) -->
-    <skip />
-    <!-- no translation found for about_settings_summary (7669309646592260587) -->
-    <skip />
-    <!-- no translation found for legal_information (6712607847710471677) -->
-    <skip />
-    <!-- no translation found for contributors_title (4798193298012318879) -->
-    <skip />
-    <!-- no translation found for copyright_title (2179228277436615247) -->
-    <skip />
-    <!-- no translation found for license_title (819526735187376873) -->
-    <skip />
-    <!-- no translation found for terms_title (7807601861320706623) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_title (7912723098716795094) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_unavailable (2081311778550755077) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_loading (1663818560123999889) -->
-    <skip />
-    <!-- no translation found for lock_settings_title (7146407030740583889) -->
-    <skip />
-    <!-- no translation found for lockpattern_change_lock_pattern_label (3855872620591309784) -->
-    <skip />
-    <!-- no translation found for lockpattern_need_to_unlock (3934572142701271406) -->
-    <skip />
-    <!-- no translation found for lockpattern_need_to_unlock_wrong (8623928652252263051) -->
-    <skip />
-    <!-- no translation found for lockpattern_recording_intro_header (6521907098728482417) -->
-    <skip />
-    <!-- no translation found for lockpattern_recording_intro_footer (8701414951034062700) -->
-    <skip />
-    <!-- no translation found for lockpattern_recording_inprogress (6331225683056997713) -->
-    <skip />
-    <!-- no translation found for lockpattern_recording_incorrect_too_short (8234374450664107990) -->
-    <skip />
-    <!-- no translation found for lockpattern_pattern_entered_header (8351721622267579390) -->
-    <skip />
-    <!-- no translation found for lockpattern_need_to_confirm (6414172006294337771) -->
-    <skip />
-    <!-- no translation found for lockpattern_pattern_confirmed_header (2989082429968256403) -->
-    <skip />
-    <!-- no translation found for lockpattern_confirm_button_text (1743514668885027413) -->
-    <skip />
-    <!-- no translation found for lockpattern_restart_button_text (2163326470128236491) -->
-    <skip />
-    <!-- no translation found for lockpattern_retry_button_text (7695474740059017745) -->
-    <skip />
-    <!-- no translation found for lockpattern_continue_button_text (1077275957953266837) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_title (733123887849286898) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_enable_title (6966780385011497665) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_enable_summary (1491887748201941470) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (6649207540870563710) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_choose_lock_pattern (6323198429609574435) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_change_lock_pattern (5787732340207150910) -->
-    <skip />
-    <!-- no translation found for lockpattern_settings_help_how_to_record (1365531094765843326) -->
-    <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (7630166531203362529) -->
-    <skip />
-    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (4498856168984445217) -->
-    <skip />
-    <!-- no translation found for skip_button_label (4850708311344393218) -->
-    <skip />
-    <!-- no translation found for next_button_label (3149701380025478958) -->
-    <skip />
-    <!-- no translation found for lock_title (999106562425756837) -->
-    <skip />
-    <!-- no translation found for lock_intro_message (2382351248538397170) -->
-    <skip />
-    <!-- no translation found for lock_example_title (6261868148302088973) -->
-    <skip />
-    <!-- no translation found for lock_example_message (2583534765034914458) -->
-    <skip />
-    <!-- no translation found for manageapplications_settings_title (3359899792647354589) -->
-    <skip />
-    <!-- no translation found for applications_settings (6104314134883460574) -->
-    <skip />
-    <!-- no translation found for applications_settings_summary (7666960391957493763) -->
-    <skip />
-    <!-- no translation found for applications_settings_header (6167136604757235210) -->
-    <skip />
-    <!-- no translation found for install_applications (8586540661161378543) -->
-    <skip />
-    <!-- no translation found for install_unknown_applications (8694019339326383901) -->
-    <skip />
-    <!-- no translation found for install_all_warning (5826871395153503952) -->
-    <skip />
-    <!-- no translation found for manage_applications_title (8288310040777485758) -->
-    <skip />
-    <!-- no translation found for application_info_label (605192869687093760) -->
-    <skip />
-    <!-- no translation found for storage_label (8765276782501761971) -->
-    <skip />
-    <!-- no translation found for auto_launch_label (3546876666453498673) -->
-    <skip />
-    <!-- no translation found for permissions_label (3244346920180368862) -->
-    <skip />
-    <!-- no translation found for total_size_label (5016115699600749568) -->
-    <skip />
-    <!-- no translation found for application_size_label (5378963933449396413) -->
-    <skip />
-    <!-- no translation found for data_size_label (6038126657652457179) -->
-    <skip />
-    <!-- no translation found for uninstall_text (2322009518449651787) -->
-    <skip />
-    <!-- no translation found for clear_user_data_text (3586758620250813061) -->
-    <skip />
-    <!-- no translation found for auto_launch_enable_text (8228619838865933982) -->
-    <skip />
-    <!-- no translation found for auto_launch_disable_text (4696687016762486484) -->
-    <skip />
-    <!-- no translation found for clear_activities (2399981667625036009) -->
-    <skip />
-    <!-- no translation found for unknown (7966307317466394761) -->
-    <skip />
-    <!-- no translation found for sort_order_alpha (210746743398042077) -->
-    <skip />
-    <!-- no translation found for sort_order_size (2716777274377923612) -->
-    <skip />
-    <!-- no translation found for manage_space_text (3118726017144542336) -->
-    <skip />
-    <!-- no translation found for filter_apps_all (5819127882791374920) -->
-    <skip />
-    <!-- no translation found for filter_apps_third_party (8693065498520334174) -->
-    <skip />
-    <!-- no translation found for filter_apps_running (2019159142681656258) -->
-    <skip />
-    <!-- no translation found for loading (5170696093820794830) -->
-    <skip />
-    <!-- no translation found for recompute_size (8376294373548662083) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_title (2115093619616088799) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_text (3004273956481932846) -->
-    <skip />
-    <!-- no translation found for dlg_ok (2225130755859653348) -->
-    <skip />
-    <!-- no translation found for dlg_cancel (8597172015374919396) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_title (6649900521951617898) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_text (6893475426667174751) -->
-    <skip />
-    <!-- no translation found for clear_data_failed (3040984234884359027) -->
-    <skip />
-    <!-- no translation found for security_settings_desc (5898339748632998613) -->
-    <skip />
-    <!-- no translation found for default_app_desc (3475613003133497043) -->
-    <skip />
-    <!-- no translation found for computing_size (7350089935999085554) -->
-    <skip />
-    <!-- no translation found for invalid_size_value (3054945647487201471) -->
-    <skip />
-    <!-- no translation found for language_settings (7247557040404006341) -->
-    <skip />
-    <!-- no translation found for language_settings_summary (721948806318958691) -->
-    <skip />
-    <!-- no translation found for language_category (6646529166552376418) -->
-    <skip />
-    <!-- no translation found for text_category (3133311779500246731) -->
-    <skip />
-    <!-- no translation found for phone_language (4084332836028530631) -->
-    <skip />
-    <!-- no translation found for auto_replace (6134508433464846627) -->
-    <skip />
-    <!-- no translation found for auto_replace_summary (1016177921245107750) -->
-    <skip />
-    <!-- no translation found for auto_caps (6021984352657087728) -->
-    <skip />
-    <!-- no translation found for auto_caps_summary (4783973594319542220) -->
-    <skip />
-    <!-- no translation found for auto_punctuate (2819742922158924703) -->
-    <skip />
-    <!-- no translation found for auto_punctuate_summary (2664143621323054924) -->
-    <skip />
-    <!-- no translation found for show_password (2353636034424349266) -->
-    <skip />
-    <!-- no translation found for show_password_summary (3920555488855590831) -->
-    <skip />
-    <!-- no translation found for testing (555268605244514909) -->
-    <skip />
-    <!-- no translation found for testing_phone_info (8718517606602144606) -->
-    <skip />
-    <!-- no translation found for testing_battery_info (3826036256683980425) -->
-    <skip />
-    <!-- no translation found for quick_launch_title (5423323579273213815) -->
-    <skip />
-    <!-- no translation found for quick_launch_summary (1272194567210324017) -->
-    <skip />
-    <!-- no translation found for quick_launch_assign_application (5949445664563354321) -->
-    <skip />
-    <!-- no translation found for quick_launch_no_shortcut (5958195604101558965) -->
-    <skip />
-    <!-- no translation found for quick_launch_shortcut (1115195051591830635) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_title (5217130241215296612) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_message (3420665419624963430) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_ok_button (2442832413597511429) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_cancel_button (1437354385792055993) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_applications (6570683843184675363) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_shortcuts (6642750364678074004) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_title (1752662012056721926) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_summary (5481367119142131313) -->
-    <skip />
-    <!-- no translation found for development_settings_title (4671731485005432632) -->
-    <skip />
-    <!-- no translation found for development_settings_summary (5518361138194831299) -->
-    <skip />
-    <!-- no translation found for enable_adb (7770070343289262572) -->
-    <skip />
-    <!-- no translation found for enable_adb_summary (1498997582065835981) -->
-    <skip />
-    <!-- no translation found for keep_screen_on (5805533478834516956) -->
-    <skip />
-    <!-- no translation found for keep_screen_on_summary (5703353541069794974) -->
-    <skip />
-    <!-- no translation found for allow_mock_location (6204808904743157937) -->
-    <skip />
-    <!-- no translation found for allow_mock_location_summary (3154837501223277592) -->
-    <skip />
-</resources>
diff --git a/res/values-nb-nokeys/strings.xml b/res/values-nb-nokeys/strings.xml
new file mode 100644
index 0000000..0e080b4
--- /dev/null
+++ b/res/values-nb-nokeys/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Installerte applikasjoner, hurtigtaster"</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bd6881f..6e03e32 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -49,8 +49,7 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Unmount SD card"</string>
-    <!-- no translation found for sdcard_format (362497552060004057) -->
-    <skip />
+    <string name="sdcard_format">"Format SD card"</string>
     <string name="small_font">"Liten"</string>
     <string name="medium_font">"Middels"</string>
     <string name="large_font">"Stor"</string>
@@ -160,8 +159,7 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Update"</string>
     <string name="radio_info_smsc_refresh_label">"Refresh"</string>
-    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
-    <skip />
+    <string name="radio_info_toggle_dns_check_label">"Toggle DNS check"</string>
     <string name="band_mode_title">"Velg GSM/UMTS-bånd"</string>
     <string name="band_mode_loading">"Henter båndliste…"</string>
     <string name="band_mode_set">"Velg"</string>
@@ -184,8 +182,7 @@
     <string name="activity_picker_label">"Velg aktivitet"</string>
     <string name="device_info_label">"Enhetsinformasjon"</string>
     <string name="battery_info_label">"Batteriinformasjon"</string>
-    <!-- no translation found for battery_history_label (8242244969757414501) -->
-    <skip />
+    <string name="battery_history_label">"Batterihistorikk"</string>
     <string name="display_label">"Skjerm"</string>
     <string name="phone_info_label">"Telefoninformasjon"</string>
     <string name="sd_card_settings_label">"Minnekort"</string>
@@ -317,12 +314,9 @@
     <string name="wifi_setting_num_channels_summary">"Velg antall kanaler som skal brukes"</string>
     <string name="wifi_setting_num_channels_error">"Kunne ikke velge juridisk område."</string>
     <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanaler"</string>
-    <!-- no translation found for wifi_setting_sleep_policy_title (1367731352485585528) -->
-    <skip />
-    <!-- no translation found for wifi_setting_sleep_policy_summary (7573693311804602041) -->
-    <skip />
-    <!-- no translation found for wifi_setting_sleep_policy_error (5103670439972135148) -->
-    <skip />
+    <string name="wifi_setting_sleep_policy_title">"Soveinnstillinger for trådløst nett"</string>
+    <string name="wifi_setting_sleep_policy_summary">"Spesifiser når telefonen skal bytte fra trådløsnett til mobiltelefonidata"</string>
+    <string name="wifi_setting_sleep_policy_error">"Det oppsto et problem under setting av soveinnstilling."</string>
     <string name="wifi_advanced_mac_address_title">"MAC-adresse"</string>
     <string name="fragment_status_scanning">"Søker…"</string>
     <string name="fragment_status_connecting">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
@@ -365,12 +359,9 @@
     <string name="sound_effects_enable_title">"Hørbart valg"</string>
     <string name="sound_effects_enable_summary_on">"Lag lyd under skjermvalg"</string>
     <string name="sound_effects_enable_summary_off">"Lag lyd under skjermvalg"</string>
-    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
-    <skip />
-    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
-    <skip />
+    <string name="play_media_notification_sounds_enable_title">"Varsling for minnekort"</string>
+    <string name="play_media_notification_sounds_enable_summary_on">"Deaktiver varslingslyder for minnekort"</string>
+    <string name="play_media_notification_sounds_enable_summary_off">"Aktiver varslingslyder for minnekort"</string>
     <string name="sync_settings">"Datasynkronisering"</string>
     <string name="sync_settings_summary">"Applikasjoner som skal synkroniseres"</string>
     <string name="display_settings">"Skjerminnstillinger"</string>
@@ -378,11 +369,9 @@
     <string name="animations_summary_on">"Vis animasjon når vinduer åpnes/lukkes"</string>
     <string name="animations_summary_off">"Vis animasjon når vinduer åpnes/lukkes"</string>
     <string name="brightness">"Lysstyrke"</string>
-    <!-- no translation found for brightness_summary (838917350127550703) -->
-    <skip />
+    <string name="brightness_summary">"Juster skjermens lysstyrke"</string>
     <string name="screen_timeout">"Skjermsparer"</string>
-    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
-    <skip />
+    <string name="screen_timeout_summary">"Juster hvor lang tid som skal gå før skjermen slås av automatisk"</string>
     <string name="sim_lock_settings">"Innstillinger for SIM-kort-lås"</string>
     <string name="sim_lock_settings_category">"Sett opp SIM-kort-lås"</string>
     <string name="sim_lock_settings_title">"SIM-kort-lås"</string>
@@ -428,10 +417,8 @@
     <string name="status_wifi_mac_address">"MAC-adresse for WLAN"</string>
     <string name="status_bt_address">"Bluetooth-adresse"</string>
     <string name="status_unavailable">"Ikke tilgjengelig"</string>
-    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
-    <skip />
-    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
-    <skip />
+    <string name="status_network_traffic_stats">"Nettverksbruk"</string>
+    <string name="status_network_traffic_summary">"Sendt: <xliff:g id="NETWORK_TRAFFIC_0">%1$d packets, %2$d bytes%n</xliff:g>Mottatt: <xliff:g id="NETWORK_TRAFFIC_1">%3$d packets, %4$d bytes</xliff:g>"</string>
     <string name="status_up_time">"Oppetid"</string>
     <string name="status_awake_time">"Våken tid"</string>
     <string name="internal_memory">"Intern lagringsplass"</string>
@@ -439,12 +426,9 @@
     <string name="memory_available">"Tilgjengelig plass"</string>
     <string name="memory_size">"Total plass"</string>
     <string name="sd_eject">"Avmonter/løs ut minnekort"</string>
-    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
-    <skip />
-    <!-- no translation found for sd_format (5448738337382712203) -->
-    <skip />
-    <!-- no translation found for sd_format_summary (6616491027883134004) -->
-    <skip />
+    <string name="sd_eject_summary">"Løs ut minnekortet for trygg fjerning"</string>
+    <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="battery_status_title">"Batteristatus"</string>
@@ -483,22 +467,14 @@
     <string name="master_clear_gesture_prompt">"Tegn opplåsingsmønsteret"</string>
     <string name="master_clear_gesture_explanation">"Du må tegne opplåsingsmønsteret for å bekrefte nullstilling av telefonen."</string>
     <string name="master_clear_failed">"Telefonen ble ikke nullstilt fordi nullstillingstjenesten ikke er tilgjengelig."</string>
-    <!-- no translation found for media_format_title (4671276096695789895) -->
-    <skip />
-    <!-- no translation found for media_format_summary (3805714639375830120) -->
-    <skip />
-    <!-- no translation found for media_format_desc (1142563222357820834) -->
-    <skip />
-    <!-- no translation found for media_format_button_text (370856400090190151) -->
-    <skip />
-    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
-    <skip />
-    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
-    <skip />
-    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
-    <skip />
-    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
-    <skip />
+    <string name="media_format_title">"Formater minnekort"</string>
+    <string name="media_format_summary">"Sletter alle data fra minnekortet"</string>
+    <string name="media_format_desc">"Dette valget vil slette alle data fra minnekortet i telefonen. Du vil miste ALLE data på kortet!"</string>
+    <string name="media_format_button_text">"Formater minnekort"</string>
+    <string name="media_format_final_desc">"Formater minnekortet? Dette vil fjerne alle data, og kan ikke gjøres om!"</string>
+    <string name="media_format_final_button_text">"Slett alt"</string>
+    <string name="media_format_gesture_prompt">"Tegn opplåsingsmønsteret"</string>
+    <string name="media_format_gesture_explanation">"Du må tegne opplåsingsmønsteret for å bekrefte formatering av minnekortet."</string>
     <string name="call_settings_title">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="network_settings_title">"Mobile nettverk"</string>
@@ -552,8 +528,7 @@
     <string name="lock_example_title">"Eksempelmønster"</string>
     <string name="lock_example_message">"Tegn over minst fire prikker."\n" "\n"Velg «Neste» når du er klar til å tegne ditt eget mønster."</string>
     <string name="manageapplications_settings_title">"Installerte applikasjoner"</string>
-    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
-    <skip />
+    <string name="manageapplications_settings_summary">"Hold orden på og fjern installerte applikasjoner"</string>
     <string name="applications_settings">"Applikasjoner"</string>
     <string name="applications_settings_summary">"Installerte applikasjoner, hurtigtaster"</string>
     <string name="applications_settings_header">"Innstillinger for applikasjoner"</string>
@@ -567,10 +542,8 @@
     <string name="cache_header_label">"Hurtiglager"</string>
     <string name="clear_cache_btn_text">"Fjern hurtiglager"</string>
     <string name="cache_size_label">"Hurtiglager"</string>
-    <!-- no translation found for controls_label (7611113077086853799) -->
-    <skip />
-    <!-- no translation found for force_stop (7435006169872876756) -->
-    <skip />
+    <string name="controls_label">"Kontroller"</string>
+    <string name="force_stop">"Tving avslutning"</string>
     <string name="total_size_label">"Totalt"</string>
     <string name="application_size_label">"Applikasjon"</string>
     <string name="data_size_label">"Data"</string>
@@ -583,10 +556,8 @@
     <string name="sort_order_alpha">"Sorter"</string>
     <string name="sort_order_size">"Sorter etter størrelse"</string>
     <string name="manage_space_text">"Styr plass"</string>
-    <!-- no translation found for filter (2018011724373033887) -->
-    <skip />
-    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
-    <skip />
+    <string name="filter">"Filter"</string>
+    <string name="filter_dlg_title">"Velg filtreringsinnstillinger"</string>
     <string name="filter_apps_all">"Alle"</string>
     <string name="filter_apps_third_party">"Tredjeparts"</string>
     <string name="filter_apps_running">"Kjører"</string>
@@ -608,39 +579,28 @@
     <string name="language_category">"Innstillinger for språk"</string>
     <string name="text_category">"Tekstinnstillinger"</string>
     <string name="phone_language">"Språk"</string>
-    <!-- no translation found for phone_language_summary (1809580675831352352) -->
-    <skip />
+    <string name="phone_language_summary">"Velg språk og region"</string>
     <string name="auto_replace">"Automatisk erstatting"</string>
     <string name="auto_replace_summary">"Rett opp stavefeil"</string>
     <string name="auto_caps">"Stor forbokstav"</string>
     <string name="auto_caps_summary">"Start automatisk setninger med stor bokstav"</string>
     <string name="auto_punctuate">"Autopunktum"</string>
-    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
-    <skip />
+    <string name="hardkeyboard_category">"Innstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password">"Synlige passord"</string>
     <string name="show_password_summary">"Vis passord mens de skrives inn"</string>
-    <!-- no translation found for user_dict_settings_titlebar (765659257455000490) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_title (8357027437499042191) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_summary (2460427065601355471) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
-    <skip />
-    <!-- no translation found for user_dict_settings_empty_text (6209268025109242806) -->
-    <skip />
+    <string name="user_dict_settings_titlebar">"Ordliste"</string>
+    <string name="user_dict_settings_title">"Ordliste"</string>
+    <string name="user_dict_settings_summary">"Legg til og fjern ord fra ordlisten"</string>
+    <string name="user_dict_settings_add_menu_title">"Legg til"</string>
+    <string name="user_dict_settings_add_dialog_title">"Legg til ordliste"</string>
+    <string name="user_dict_settings_context_menu_edit_title">"Rediger"</string>
+    <string name="user_dict_settings_context_menu_delete_title">"Slett"</string>
+    <string name="user_dict_settings_empty_text">"Ordlisten er tom. Du kan legge til ord i menyen."</string>
     <string name="testing">"Testing"</string>
     <string name="testing_phone_info">"Telefoninformasjon"</string>
     <string name="testing_battery_info">"Batteriinformasjon"</string>
-    <!-- no translation found for testing_battery_history (3043329445810695647) -->
-    <skip />
+    <string name="testing_battery_history">"Batterihistorikk"</string>
     <string name="quick_launch_title">"Hurtigtaster"</string>
     <string name="quick_launch_summary">"Tastatursnarveier for å starte applikasjoner"</string>
     <string name="quick_launch_assign_application">"Tilordne applikasjon"</string>
@@ -654,8 +614,7 @@
     <string name="quick_launch_display_mode_shortcuts">"Snarveier"</string>
     <string name="input_methods_settings_title">"Skriving av tekst"</string>
     <string name="input_methods_settings_summary">"Innstillinger for skriving av tekst"</string>
-    <!-- no translation found for input_methods_settings_label_format (4882768027634191074) -->
-    <skip />
+    <string name="input_methods_settings_label_format">"Innstillinger for %s"</string>
     <string name="development_settings_title">"Utvikling"</string>
     <string name="development_settings_summary">"Innstillinger for applikasjonsutvikling"</string>
     <string name="enable_adb">"USB-debugging"</string>
@@ -664,68 +623,36 @@
     <string name="keep_screen_on_summary">"Skjermen vil aldri blankes under lading"</string>
     <string name="allow_mock_location">"Tillat manuell plassering"</string>
     <string name="allow_mock_location_summary">"Tillat manuell plassering"</string>
-    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
-    <skip />
-    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
-    <skip />
-    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
-    <skip />
-    <!-- no translation found for battery_history_uid (1016606150528436298) -->
-    <skip />
-    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
-    <skip />
-    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
-    <skip />
-    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
-    <skip />
-    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
-    <skip />
-    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
-    <skip />
-    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
-    <skip />
-    <!-- no translation found for battery_history_starts (9137453931978571696) -->
-    <skip />
-    <!-- no translation found for battery_history_days (6387593985264923377) -->
-    <skip />
-    <!-- no translation found for battery_history_hours (2593055276272350197) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
-    <skip />
-    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
-    <skip />
-    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
-    <skip />
-    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
-    <skip />
-    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
-    <skip />
-    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
-    <skip />
-    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
-    <skip />
-    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
-    <skip />
-    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
-    <skip />
-    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
-    <skip />
-    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
-    <skip />
-    <!-- no translation found for usage_stats_label (5890846333487083609) -->
-    <skip />
-    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
-    <skip />
-    <!-- no translation found for display_order_text (8592776965827565271) -->
-    <skip />
-    <!-- no translation found for app_name_label (2000949925256858308) -->
-    <skip />
-    <!-- no translation found for launch_count_label (4019444833263957024) -->
-    <skip />
-    <!-- no translation found for usage_time_label (295954901452833058) -->
-    <skip />
+    <string name="battery_history_known_apps">"Android System;Dialer;Calendar;Camera;Google Apps;Contacts;"</string>
+    <string name="gadget_picker_title">"Velg gadget"</string>
+    <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>
+    <string name="battery_history_bytes_received">"Byte mottatt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_sent">"Byte sendt: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_bytes_total">"Totalt antall byte: <xliff:g id="BYTES">%1$d</xliff:g>"</string>
+    <string name="battery_history_cpu_usage">"CPU-bruk av <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
+    <string name="battery_history_user_time">"Brukertid:"</string>
+    <string name="battery_history_system_time">"Systemtid:"</string>
+    <string name="battery_history_total_time">"Total tid:"</string>
+    <string name="battery_history_starts">"Oppstarter: <xliff:g id="STARTS">%1$d</xliff:g>"</string>
+    <string name="battery_history_days">"<xliff:g id="DAYS">%1$d</xliff:g> dager, <xliff:g id="HOURS">%2$d</xliff:g> timer, <xliff:g id="MINUTES">%3$d</xliff:g> minutter, <xliff:g id="SECONDS">%4$d</xliff:g> sekunder"</string>
+    <string name="battery_history_hours">"<xliff:g id="HOURS">%1$d</xliff:g> timer, <xliff:g id="MINUTES">%2$d</xliff:g> minutter, <xliff:g id="SECONDS">%3$d</xliff:g> sekunder"</string>
+    <string name="battery_history_minutes">"<xliff:g id="MINUTES">%1$d</xliff:g> minutter, <xliff:g id="SECONDS">%2$d</xliff:g> sekunder"</string>
+    <string name="battery_history_seconds">"<xliff:g id="SECONDS">%1$d</xliff:g> sekunder"</string>
+    <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>
+    <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>
+    <string name="battery_history_screen_on">"Tid brukt med skjermen på:"</string>
+    <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>
+    <string name="testing_usage_stats">"Bruksstatistikk"</string>
+    <string name="display_order_text">"Sorter etter:"</string>
+    <string name="app_name_label">"Applikasjon"</string>
+    <string name="launch_count_label">"Antall"</string>
+    <string name="usage_time_label">"Brukstid"</string>
 </resources>
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 3697319..be01f7d 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -65,18 +65,24 @@ public class DeviceInfoSettings extends PreferenceActivity {
          * Settings is a generic app and should not contain any device-specific
          * info.
          */
+        
+        // These are contained in the "container" preference group
         PreferenceGroup parentPreference = (PreferenceGroup) findPreference(KEY_CONTAINER);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_TERMS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_LICENSE,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,
-                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_COPYRIGHT,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
         Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_TEAM,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_SYSTEM_UPDATE_SETTINGS,
+        
+        // These are contained by the root preference screen
+        parentPreference = getPreferenceScreen();
+        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference,
+                KEY_SYSTEM_UPDATE_SETTINGS,
+                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+        Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
     }
     
diff --git a/src/com/android/settings/GadgetPickActivity.java b/src/com/android/settings/GadgetPickActivity.java
index 09e0fc7..408039a 100644
--- a/src/com/android/settings/GadgetPickActivity.java
+++ b/src/com/android/settings/GadgetPickActivity.java
@@ -20,7 +20,7 @@ import android.app.LauncherActivity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.gadget.GadgetInfo;
+import android.gadget.GadgetProviderInfo;
 import android.gadget.GadgetManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -28,8 +28,11 @@ import android.view.View;
 import android.widget.ListView;
 import android.util.Log;
 
+import java.text.Collator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 public class GadgetPickActivity extends LauncherActivity
 {
@@ -37,7 +40,6 @@ public class GadgetPickActivity extends LauncherActivity
 
     GadgetManager mGadgetManager;
     int mGadgetId;
-    int mHostId;
     
     public GadgetPickActivity() {
         mGadgetManager = GadgetManager.getInstance(this);
@@ -48,7 +50,6 @@ public class GadgetPickActivity extends LauncherActivity
         super.onCreate(icicle);
 
         Bundle extras = getIntent().getExtras();
-        mHostId = extras.getInt(GadgetManager.EXTRA_HOST_ID);
         mGadgetId = extras.getInt(GadgetManager.EXTRA_GADGET_ID);
 
         setResultData(RESULT_CANCELED);
@@ -65,7 +66,7 @@ public class GadgetPickActivity extends LauncherActivity
     
     @Override
     public List<ListItem> makeListItems() {
-        List<GadgetInfo> installed = mGadgetManager.getInstalledProviders();
+        List<GadgetProviderInfo> installed = mGadgetManager.getInstalledProviders();
         PackageManager pm = getPackageManager();
 
         Drawable defaultIcon = null;
@@ -74,7 +75,7 @@ public class GadgetPickActivity extends LauncherActivity
         ArrayList<ListItem> result = new ArrayList();
         final int N = installed.size();
         for (int i=0; i<N; i++) {
-            GadgetInfo info = installed.get(i);
+            GadgetProviderInfo info = installed.get(i);
 
             LauncherActivity.ListItem item = new LauncherActivity.ListItem();
             item.packageName = info.provider.getPackageName();
@@ -100,9 +101,16 @@ public class GadgetPickActivity extends LauncherActivity
             
             result.add(item);
         }
+
+        Collections.sort(result, new Comparator<ListItem>() {
+                Collator mCollator = Collator.getInstance();
+                public int compare(ListItem lhs, ListItem rhs) {
+                    return mCollator.compare(lhs.label, rhs.label);
+                }
+            });
         return result;
     }
-    
+
     void setResultData(int code) {
         Intent result = new Intent();
         result.putExtra(GadgetManager.EXTRA_GADGET_ID, mGadgetId);
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index e5311ae..512e547 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -133,13 +133,14 @@ public class ManageApplications extends ListActivity implements
     
     // messages posted to the handler
     private static final int HANDLER_MESSAGE_BASE = 0;
-    private static final int COMPUTE_PKG_SIZE_START = HANDLER_MESSAGE_BASE+1;
+    private static final int INIT_PKG_INFO = HANDLER_MESSAGE_BASE+1;
     private static final int COMPUTE_PKG_SIZE_DONE = HANDLER_MESSAGE_BASE+2;
     private static final int REMOVE_PKG = HANDLER_MESSAGE_BASE+3;
     private static final int REORDER_LIST = HANDLER_MESSAGE_BASE+4;
     private static final int ADD_PKG_START = HANDLER_MESSAGE_BASE+5;
     private static final int ADD_PKG_DONE = HANDLER_MESSAGE_BASE+6;
     private static final int REFRESH_ICONS = HANDLER_MESSAGE_BASE+7;
+    private static final int NEXT_LOAD_STEP = HANDLER_MESSAGE_BASE+8;
     
     // observer object used for computing pkg sizes
     private PkgSizeObserver mObserver;
@@ -150,7 +151,7 @@ public class ManageApplications extends ListActivity implements
     private PackageIntentReceiver mReceiver;
     // atomic variable used to track if computing pkg sizes is in progress. should be volatile?
     
-    private boolean mDoneIniting = false;
+    private boolean mComputeSizes = false;
     // default icon thats used when displaying applications initially before resource info is
     // retrieved
     private Drawable mDefaultAppIcon;
@@ -189,6 +190,13 @@ public class ManageApplications extends ListActivity implements
     //TODO implement a cache system
     private Map<String, AppInfo> mAppPropCache;
     
+    // empty message displayed when list is empty
+    private TextView mEmptyView;
+    
+    // Boolean variables indicating state
+    private boolean mLoadLabels = false;
+    private boolean mSizesFirst = false;
+    
     /*
      * Handler class to handle messages for various operations
      * Most of the operations that effect Application related data
@@ -232,11 +240,13 @@ public class ManageApplications extends ListActivity implements
                 pkgName = data.getString(ATTR_PKG_NAME);
             }
             switch (msg.what) {
-            case COMPUTE_PKG_SIZE_START:
-                if(localLOGV) Log.i(TAG, "Message COMPUTE_PKG_SIZE_START");
+            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);
                 break;
             case COMPUTE_PKG_SIZE_DONE:
                 if(localLOGV) Log.i(TAG, "Message COMPUTE_PKG_SIZE_DONE");
@@ -297,9 +307,9 @@ public class ManageApplications extends ListActivity implements
                                 COMPUTE_PKG_SIZE_DONE);
                     } else {
                         // end computation here
-                        mDoneIniting = true;
+                        mComputeSizes = true;
                         mAppInfoAdapter.sortList(mSortOrder);
-                        setProgressBarIndeterminateVisibility(false);
+                        mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
                     }
                 }
                 break;
@@ -309,7 +319,7 @@ public class ManageApplications extends ListActivity implements
                     Log.w(TAG, "Ignoring message:REMOVE_PKG for null pkgName");
                     break;
                 }
-                if (!mDoneIniting) {
+                if (!mComputeSizes) {
                     Boolean currB = mAddRemoveMap.get(pkgName);
                     if (currB == null || (currB.equals(Boolean.TRUE))) {
                         mAddRemoveMap.put(pkgName, Boolean.FALSE);
@@ -340,7 +350,7 @@ public class ManageApplications extends ListActivity implements
                         // Reset cache
                         mAppPropCache = null;
                         mFilterApps = FILTER_APPS_ALL;
-                        mHandler.sendEmptyMessage(COMPUTE_PKG_SIZE_START);
+                        mHandler.sendEmptyMessage(INIT_PKG_INFO);
                         sendMessageToHandler(REORDER_LIST, menuOption);
                     }
                 }
@@ -351,7 +361,7 @@ public class ManageApplications extends ListActivity implements
                     Log.w(TAG, "Ignoring message:ADD_PKG_START for null pkgName");
                     break;
                 }
-                if (!mDoneIniting) {
+                if (!mComputeSizes) {
                     Boolean currB = mAddRemoveMap.get(pkgName);
                     if (currB == null || (currB.equals(Boolean.FALSE))) {
                         mAddRemoveMap.put(pkgName, Boolean.TRUE);
@@ -380,23 +390,43 @@ public class ManageApplications extends ListActivity implements
                 if(iconMap == null) {
                     Log.w(TAG, "Error loading icons for applications");
                 } else {
-                    mAppInfoAdapter.updateAppsResourceInfo(iconMap);
+                    mAppInfoAdapter.updateAppsResourceInfo(iconMap);   
                 }
-                // initiate compute pkg sizes
-                if (localLOGV) Log.i(TAG, "Initiating compute sizes for first time");
-                mObserver = new PkgSizeObserver();
-                if (mAppInfoAdapter.getCount() > 0) {
-                    mObserver.invokeGetSizeInfo(mAppInfoAdapter.getApplicationInfo(0),
-                            COMPUTE_PKG_SIZE_DONE);
+                mLoadLabels = true;
+                mHandler.sendEmptyMessage(NEXT_LOAD_STEP);
+                break;
+            case NEXT_LOAD_STEP:
+                if (mComputeSizes && mLoadLabels) {
+                    doneLoadingData();
+                } else if (!mComputeSizes && !mLoadLabels) {
+                     // Either load the package labels or initiate get size info
+                    if (mSizesFirst) {
+                        initComputeSizes();
+                    } else {
+                        initResourceThread();
+                    }
                 } else {
-                    mDoneIniting = true;
+                    // 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();
+                    if (!mComputeSizes) {
+                        initComputeSizes();
+                    } else if (!mLoadLabels) {
+                        initResourceThread();
+                    }
                 }
+                break;
             default:
                 break;
             }
         }
     };
     
+    private void doneLoadingData() {
+        setProgressBarIndeterminateVisibility(false);
+    }
+    
     List<ApplicationInfo> getInstalledApps(int filterOption) {
         List<ApplicationInfo> installedAppList = mPm.getInstalledApplications(
                 PackageManager.GET_UNINSTALLED_PACKAGES);
@@ -457,27 +487,54 @@ public class ManageApplications extends ListActivity implements
     
     // some initialization code used when kicking off the size computation
     private void initAppList(int filterOption) {
-        mDoneIniting = false;
+        mComputeSizes = false;
         // Initialize lists
         List<ApplicationInfo> appList = getInstalledApps(filterOption);
         mAddRemoveMap = new TreeMap<String, Boolean>();
-        mAppInfoAdapter = new AppInfoAdapter(this, appList);
+        mAppInfoAdapter = new AppInfoAdapter(this, appList);       
+        // register receiver
+        mReceiver.registerReceiver();
+    }
+    
+    // Utility method to start a thread to read application labels and icons
+    private void initResourceThread() {
+        //load resources now
+        if(mResourceThread.isAlive()) {
+            mResourceThread.interrupt();
+        }
+        mResourceThread.loadAllResources(mAppInfoAdapter.getAppList());
+    }
+    
+    private void initComputeSizes() {
+         // initiate compute pkg sizes
+        if (localLOGV) Log.i(TAG, "Initiating compute sizes for first time");
+        if (mAppInfoAdapter.getCount() > 0) {
+            mObserver.invokeGetSizeInfo(mAppInfoAdapter.getApplicationInfo(0),
+                    COMPUTE_PKG_SIZE_DONE);
+        } else {
+            mComputeSizes = true;
+        }
+    }
+    
+    private void showEmptyViewIfListEmpty() {
+        if (localLOGV) Log.i(TAG, "Checking for empty view");
+        if (mAppInfoAdapter.getCount() > 0) {
+            mEmptyView.setVisibility(View.GONE);
+        } else {
+            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);
-        lv.setAdapter(mAppInfoAdapter);
-        // register receiver
-        mReceiver = new PackageIntentReceiver();
-        mReceiver.registerReceiver();
-        //load resources now
-        if(mResourceThread.isAlive()) {
-            mResourceThread.interrupt();
-        }
-        mResourceThread.loadAllResources(appList);
+        showEmptyViewIfListEmpty();
     }
     
     // internal structure used to track added and deleted packages when
@@ -495,21 +552,21 @@ public class ManageApplications extends ListActivity implements
         List<ApplicationInfo> mAppList;
         
         void loadAllResources(List<ApplicationInfo> appList) {
-            if(appList == null || appList.size() <= 0) {
-                Log.w(TAG, "Empty or null application list");
-                return;
-            }
             mAppList = appList;
             start();
         }
 
         public void run() {
             Map<String, AppInfo> iconMap = new HashMap<String, AppInfo>();
-            for (ApplicationInfo appInfo : mAppList) {
-                CharSequence appName = appInfo.loadLabel(mPm);
-                Drawable appIcon = appInfo.loadIcon(mPm);
-                iconMap.put(appInfo.packageName, 
-                        new AppInfo(appInfo.packageName, appName, appIcon));
+            if(mAppList == null || mAppList.size() <= 0) {
+                Log.w(TAG, "Empty or null application list");
+            } else {
+                for (ApplicationInfo appInfo : mAppList) {
+                    CharSequence appName = appInfo.loadLabel(mPm);
+                    Drawable appIcon = appInfo.loadIcon(mPm);
+                    iconMap.put(appInfo.packageName, 
+                            new AppInfo(appInfo.packageName, appName, appIcon));
+                }
             }
             Message msg = mHandler.obtainMessage(REFRESH_ICONS);
             msg.obj = iconMap;
@@ -697,6 +754,10 @@ public class ManageApplications extends ListActivity implements
         }
         
         public View getView(int position, View convertView, ViewGroup parent) {
+            if (position >= mAppLocalList.size()) {
+                Log.w(TAG, "Invalid view position:"+position+", actual size is:"+mAppLocalList.size());
+                return null;
+            }
             // A ViewHolder keeps references to children views to avoid unneccessary calls
             // to findViewById() on each row.
             AppViewHolder holder;
@@ -773,7 +834,12 @@ public class ManageApplications extends ListActivity implements
                    mAppPropMap.put(applicationInfo.packageName, rInfo);
                }
            }
-           sortList(mSortOrder);
+           if (mAppLocalList.size() > 0) {
+               sortList(mSortOrder);
+           } else {
+               notifyDataSetChanged();
+           }
+           showEmptyViewIfListEmpty();
            return true;
         }
         
@@ -927,7 +993,7 @@ public class ManageApplications extends ListActivity implements
      * posts a message, we do a cursory check of validity on mAppInfoAdapter's applist
      */
     private void clearMessagesInHandler() {
-        mHandler.removeMessages(COMPUTE_PKG_SIZE_START);
+        mHandler.removeMessages(INIT_PKG_INFO);
         mHandler.removeMessages(COMPUTE_PKG_SIZE_DONE);
         mHandler.removeMessages(REMOVE_PKG);
         mHandler.removeMessages(REORDER_LIST);
@@ -1040,12 +1106,14 @@ public class ManageApplications extends ListActivity implements
         String action = lIntent.getAction();
         if (action.equals(Intent.ACTION_MANAGE_PACKAGE_STORAGE)) {
             mSortOrder = SORT_ORDER_SIZE;
+            mSizesFirst = true;
         }
         mPm = getPackageManager();
         // initialize some window features
         requestWindowFeature(Window.FEATURE_RIGHT_ICON);
         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);
@@ -1058,6 +1126,9 @@ public class ManageApplications extends ListActivity implements
         mComputingSizeStr = getText(R.string.computing_size);
         // initialize the inflater
         mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mReceiver = new PackageIntentReceiver();
+        mEmptyView = (TextView) findViewById(R.id.empty_view);
+        mObserver = new PkgSizeObserver();
     }
     
     private void showLoadingMsg() {
@@ -1077,11 +1148,10 @@ public class ManageApplications extends ListActivity implements
     @Override
     public void onStart() {
         super.onStart();
-        setContentView(R.layout.compute_sizes);
         showLoadingMsg();
         // Create a thread to load resources
         mResourceThread = new ResourceLoaderThread();
-        sendMessageToHandler(COMPUTE_PKG_SIZE_START);
+        sendMessageToHandler(INIT_PKG_INFO);
     }
 
     @Override
@@ -1138,13 +1208,14 @@ public class ManageApplications extends ListActivity implements
                 .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
         menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
                 .setIcon(android.R.drawable.ic_menu_sort_by_size); 
-        menu.add(0, FILTER_OPTIONS, 3, R.string.filter);
+        menu.add(0, FILTER_OPTIONS, 3, R.string.filter)
+                .setIcon(R.drawable.ic_menu_filter_settings);
         return true;
     }
     
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mDoneIniting) {
+        if (mComputeSizes) {
             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);
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 8b86a6b..89d5279 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -44,6 +44,7 @@ import java.util.Locale;
 public class UserDictionarySettings extends ListActivity {
 
     private static final String INSTANCE_KEY_DIALOG_EDITING_WORD = "DIALOG_EDITING_WORD";
+    private static final String INSTANCE_KEY_ADDED_WORD = "DIALOG_ADDED_WORD";
 
     private static final String[] QUERY_PROJECTION = {
         UserDictionary.Words._ID, UserDictionary.Words.WORD
@@ -70,6 +71,9 @@ public class UserDictionarySettings extends ListActivity {
     
     private Cursor mCursor;
     
+    private boolean mAddedWordAlready;
+    private boolean mAutoReturn;
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,15 +89,17 @@ public class UserDictionarySettings extends ListActivity {
         ListView listView = getListView();
         listView.setFastScrollEnabled(true);
         listView.setEmptyView(emptyView);
-        
+
         registerForContextMenu(listView);
     }
     
     @Override
     protected void onResume() {
         super.onResume();
-        if (getIntent().getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
+        if (!mAddedWordAlready 
+                && getIntent().getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
             String word = getIntent().getStringExtra(EXTRA_WORD);
+            mAutoReturn = true;
             if (word != null) {
                 showAddOrEditDialog(word);
             }
@@ -103,12 +109,14 @@ public class UserDictionarySettings extends ListActivity {
     protected void onRestoreInstanceState(Bundle state) {
         super.onRestoreInstanceState(state);
         mDialogEditingWord = state.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
+        mAddedWordAlready = state.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(INSTANCE_KEY_DIALOG_EDITING_WORD, mDialogEditingWord);
+        outState.putBoolean(INSTANCE_KEY_ADDED_WORD, mAddedWordAlready);
     }
 
     private Cursor createCursor() {
@@ -196,9 +204,13 @@ public class UserDictionarySettings extends ListActivity {
                 .setView(content)
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
-                        onAddOrEditFinished(editText.getText().toString());                        
+                        onAddOrEditFinished(editText.getText().toString());
+                        if (mAutoReturn) finish();
+                    }})
+                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mAutoReturn) finish();                        
                     }})
-                .setNegativeButton(android.R.string.cancel, null)
                 .create();
     }
 
@@ -220,8 +232,9 @@ public class UserDictionarySettings extends ListActivity {
         
         // TODO: present UI for picking whether to add word to all locales, or current.
         UserDictionary.Words.addWord(this, word.toString(),
-                128, UserDictionary.Words.LOCALE_TYPE_ALL);
+                250, UserDictionary.Words.LOCALE_TYPE_ALL);
         mCursor.requery();
+        mAddedWordAlready = true;
     }
 
     private void deleteWord(String word) {
diff --git a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
index f2f3bdf..b4a8ae0 100644
--- a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
+++ b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
@@ -229,9 +229,12 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
         for (Profile profile : mDevice.getProfiles()) {
             CheckBoxPreference profilePref =
                     (CheckBoxPreference) findPreference(profile.toString());
-            if (profilePref == null) continue;
-            
-            refreshProfilePreference(profilePref, profile);
+            if (profilePref == null) {
+                profilePref = createProfilePreference(profile);
+                mProfileContainer.addPreference(profilePref);
+            } else {
+                refreshProfilePreference(profilePref, profile);
+            }
         }
     }