Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
diff --git a/res/drawable-hdpi/ic_print.png b/res/drawable-hdpi/ic_print.png
deleted file mode 100644
index aaff3dd..0000000
--- a/res/drawable-hdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
index 42354cd..ce1a06c 100644
--- a/res/drawable-hdpi/ic_settings_home.png
+++ b/res/drawable-hdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_print.png b/res/drawable-mdpi/ic_print.png
deleted file mode 100644
index a3954b5..0000000
--- a/res/drawable-mdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
index 8064773..05b5e4d 100644
--- a/res/drawable-mdpi/ic_settings_home.png
+++ b/res/drawable-mdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_print.png b/res/drawable-xhdpi/ic_print.png
deleted file mode 100644
index 6b55a14..0000000
--- a/res/drawable-xhdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
index 687025d..6a4d84a 100644
--- a/res/drawable-xhdpi/ic_settings_home.png
+++ b/res/drawable-xhdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png
new file mode 100644
index 0000000..aac8773
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_home.png
Binary files differ
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index fb8c705..e4aee1b 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,7 +26,9 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
+        android:ellipsize="middle"
         android:layout_alignParentStart="true"
+        android:layout_toStartOf="@+id/value"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
         android:layout_marginStart="4dip" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0e5c60d..5f6531b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -164,7 +164,7 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsversoek"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Raak om te koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil jy koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Foonboek-toegangversoek"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Telefoonboek-toegangversoek"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang hê tot jou kontakte en oproepgeskiedenis. Gee toegang aan %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Moenie weer vra nie"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Begin <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Rekening:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Instaaninstellings"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Instaanbediener"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Maak skoon"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Instaanbediener-poort"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omseil instaanbediener vir"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Af"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Gedeaktiveer"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifisering"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Sessie-inligting"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktiveer luistermodus"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktiveer outonome GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Laat wag"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Hervat"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-opstelling"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Luisterkanaal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Werkingkanaal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerke"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Bestuur mobiele plan"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiele plan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Verstel SMS-program"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Verander SMS-program?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%s</xliff:g> as jou SMS-program?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende SIM-operateur"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s het geen bekende voorsieningwebwerf nie"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Net toestelsensors"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ligging af"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Onlangse liggingversoeke"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Geen programme het onlangs ligging versoek nie"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d. <xliff:g id="HOURS">%2$d</xliff:g>u. <xliff:g id="MINUTES">%3$d</xliff:g>m."</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>u. <xliff:g id="MINUTES">%2$d</xliff:g>m."</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Gebruikstatistieke"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Gebruikstatistieke"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rangskik volgens:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Druk"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukdienste"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Jou dokument kan dalk deur een of meer bedieners op pad na die drukker gaan."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellings"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Voeg drukkers by"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Voeg diens by"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Voeg drukker by"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Soek"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Soek tans vir drukkers"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Uitdruktake"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktiewe uitdruktake"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batterygebruikdata is nie beskikbaar nie."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Proses-statistieke"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Bleeksiel-statistieke vir lopende prosesse"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Berginggebruik"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> programme oor <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Agtergrond"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Voorgrond"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Gekas"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Toestelberging is tans <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gemiddelde geheuegebruik"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum geheuegebruik"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Looptyd"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Wys stelsel"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Gebruik Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektipe"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Agtergrond"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Voorgrond"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Gekas"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Steminvoering en -uitvoering"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Steminvoering- en -uitvoeringsinstellings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemsoektog"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan nie handmatig sinkroniseer nie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om hierdie instelling te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-instellings"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Stel 4G-netwerk en modem op en bestuur dit"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-Mac-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Voer wagwoord in om berging te dekripteer"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer weer."</string>
@@ -1959,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Gedeaktiveer"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Toestemmend"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Netwerk kan dalk gemonitor word"</string>
+    <string name="done_button" msgid="1991471253042622230">"Klaar"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Netwerkmonitering"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Hierdie toestel word bestuur deur: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nJou administrateur kan jou netwerkaktiwiteit monitor, insluitend e-pos, programme en veilige webwerwe.\n\nKontak jou administrateur vir meer inligting."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"\'n Derde party kan jou netwerk\n-aktiwiteit monitor, insluitend e-pos, programme en veilige webwerwe.\n\n\'n Vertroude eiebewys wat op jou toestel geïnstalleer is, maak dit moontlik."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Gaan vertroude eiebewyse na"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Voeg gebruiker of profiel by"</string>
@@ -2034,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Seluitsendings"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Kies die tipe noodwaarskuwings wat vertoon moet word."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Program- en inhoudbeperkings"</string>
     <string name="user_rename" msgid="8523499513614655279">"HERNOEM"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Stel program-beperkings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9f6ecc9..7baee9b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"ተገናኝቷል"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ተያይዟል (ምንም ስልክ የለም)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ተያይዟል (ምንም ማህደረ መረጃ የለም)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ተገናኝቷል (ምንም የመልዕክት መዳረሻ የለም)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ተያይዟል (ምንም ስልክ ወይም ማህደረ መረጃ የለም)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"ተለያይቷል"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"በመለያየት ላይ..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"የብሉቱዝ ተያያዥ ጠይቅ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"ወደ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለመገናኘት ንካ::"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ወደ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለማያያዝ ይፈልጋሉ?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"የስልክ ደብተር መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ዳግመኛ አትጠይቅ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"የመልዕክት መዳረሻ ጥያቄ"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"የቀን እና ሰዓት ቅንብሮች"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"ጀምር <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"መለያ:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"የእጅ አዙር ቅንብሮች"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"ተኪ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"አጥራ"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"የእጅ አዙርወደብ"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"የእጅ አዙሩን በጎንእለፍ"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ግቤት መሣሪያ"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"የበይነመረብ ድረስ"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"የመልዕክት መዳረሻ"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከማህድረ መረጃ ድምፅይለያያል።"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከእጅ ነፃኦዲዮ ይለያያል።"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከግቤት መሣሪያ ይለያያል።"</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ማህደረ  መረጃ  አውዲዮ ተያይዟል"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ከካርታ ጋር ተገናኝቷል"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ወደ ግቤት መሣሪያ ተያይዟል"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ለበይነመረብ ድረስ ወደ መሣሪያ ተያይዟል"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ለፋይል ዝውውር ተጠቀም"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ለውፅአት ተጠቀም"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ለበይነ መረብ ድረስ ተጠቀም"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ለካርታ ይጠቀሙ"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ቅንብሮች ትከል"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ለድምፅ ትከል ተጠቀም"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"በርቷል"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"ጠፍቷል"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ተሰናክሏል"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"የእውቅና ማረጋገጫ"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"የክፍለ ጊዜ መረጃ"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"የማዳመጥ ሁነታን አንቃ"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"ራስ-ሰር GO አንቃ"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"ለአፍታ አቁም"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"ከቆመበት ቀጥል"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS መዋቅር"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"የማዳመጫ ሰርጥ"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"የመስሪያ ሰርጥ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ጡባዊ ቱኮው ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"የWi-Fi መገናኛ ነጥብ ያዋቅሩ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ተንቀሳቃሽ የWi‑Fi መገናኛ ነጥብ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ድረስ ነጥብ"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"የተንቀሳቃሽ ስልክ አውታረመረብ"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"የሞባይል እቅድን ያስተዳድሩ"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"የሞባይል እቅድ"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"ነባሪ የኤስ ኤም ኤስ መተግበሪያ"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"የኤስ ኤም ኤስ መተግበሪያ ይለወጥ?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"ከ<xliff:g id="CURRENT_APP">%s</xliff:g> ይልቅ <xliff:g id="NEW_APP">%s</xliff:g> እንደ ኤስ ኤም ኤስ መተግበሪያዎ ጥቅም ላይ ይዋል?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"የማይታወቅ የSIM ከዋኝ"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s የሚታወቅ የአቅርቦት ድር ጣቢያ የለውም"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"ሁነታ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል መቆጠብ"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"የመሣሪያ ዳሳሽ አካላት ብቻ"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"አካባቢ ጠፍቷል"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%2$d</xliff:g>ደቂቃዎች<xliff:g id="SECONDS">%3$d</xliff:g>ሰከንዶች"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g>ሴኮንድ"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ሴኮንድ"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>ቀ <xliff:g id="HOURS">%2$d</xliff:g>ሰ <xliff:g id="MINUTES">%3$d</xliff:g>ደ"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ሰ <xliff:g id="MINUTES">%2$d</xliff:g>ደ"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>ደ"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ለይ በ:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"ማተም"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"የህትመት አገልግሎቶች"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ሰነድዎ ወደ አታሚው በሚሄድበት ወቅት በአንድ ወይም ከዚያ በላይ አገልጋዮች ውስጥ ሊያልፍ ይችላል።"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ቅንብሮች"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"አታሚዎችን ያክሉ"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"አገልግሎት አክል"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"አታሚ ያክሉ"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ፍለጋ"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"አታሚዎችን በመፈለግ ላይ"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"የህትመት ስራዎች"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"ገቢር የህትመት ስራዎች"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ባትሪ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ባትሪውን ምን እየተጠቀመበት ነበር"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"የባትሪ አጠቃቀም ውሂብ የለም።"</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"የሂደት ስታቲስቲክስ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"እያሄዱ ስላሉ ሂደቶች ያሉ ዝርዝር ስታቲስቲክስ"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"የማህደረ ትውስታ አጠቃቀም"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> መተግበሪያዎች ከ<xliff:g id="TIME">%2$s</xliff:g> በላይ"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"በስተጀርባ"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"ከፊት"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"የተሸጎጠ"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"የመሣሪያው ማህደረ ትውስታ በአሁኑ ጊዜ <xliff:g id="MEMSTATE">%1$s</xliff:g> ነው"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"አማካይ የራም አጠቃቀም"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ከፍተኛ የራም አጠቃቀም"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"የሚያሄድበት ጊዜ ርዝመት"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"ስርዓት አሳይ"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"ዩ ኤስ ኤስ ይጠቀሙ"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"የስታቲስቲክስ አይነት"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"በስተጀርባ"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ከፊት"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"የተሸጎጠ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"የድምፅ ግቤት &amp; ውፅአት"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"የድምፅ ግቤት &amp; ውፅአት ቅንብሮች"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"የድምፅ ፍለጋ"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"በእጅ ማመሳሰል አልተቻለም"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"የ4G ቅንብሮች"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"አዋቅር &amp;  የ4G አውታረመረብ እና ሞደም አደራጅ"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
     <string name="enter_password" msgid="4131758584074246224">"ማከማቻ ለመፍታት የይለፍ ቃል ተይብ"</string>
     <string name="try_again" msgid="4272075051293936921">"በድጋሚ ሞክር::"</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"አውታረ መረብ በክትትል ውስጥ ሊሆን ይችላል"</string>
+    <string name="done_button" msgid="1991471253042622230">"ተከናውኗል"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"የአውታረ መረብ ክትትል"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"ይህ መሳሪያ የሚተዳደረው በ፦ <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>።\n\nአስተዳዳሪዎ ኢሜይሎችዎን፣ መተግበሪያዎችዎን እና ደህንነታቸው አስተማማኝ የሆኑ ድር ጣቢያዎችን ጨምሮ የአውታረ መረብ እንቅስቃሴዎን መከታተል ይችላል።\n\nለተጨማሪ መረጃ አስተዳዳሪዎን ያግኙ።"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"ሶስተኛ ወገን ኢሜይሎችዎን፣ መተግበሪያዎችዎን እና ደህንነታቸው አስተማማኝ የሆኑ ድር ጣቢያዎችን ጨምሮ አውታረ መረብ\nእንቅስቃሴዎን መከታተል ይችላል።\n\nበመሳሪያዎ ላይ የተጫነ የታመነ ምስክርነት ይህን የሚቻል አድርጎታል።"</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"የታመኑ ምስክርነቶችን ፈትሽ"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ተጠቃሚ ወይም መገለጫ አክል"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"ይህንን መተግበሪያ አራግፍ"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"መለያ ለይዘት"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"የመተግበሪያ እና የይዘት ገደቦች"</string>
     <string name="user_rename" msgid="8523499513614655279">"ዳግም ሰይም"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"የመተግበሪያ ገደቦችን አዘጋጅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 62ef7dc..2c1c8dc 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"بدء <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"الحساب:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"إعدادات الخادم الوكيل"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"الخادم الوكيل"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"محو"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"منفذ الخادم الوكيل"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"تجاوز الخادم الوكيل لـ"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"تشغيل"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"إيقاف"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"معطل"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"الشهادة"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"معلومات الجلسة"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"تمكين وضع الاستماع"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"‏تمكين GO مستقلة"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"إيقاف مؤقت"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"استئناف"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"‏تهيئة WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"قناة الاستماع"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"قناة التشغيل"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"سيتم إلغاء ربط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"إدارة خطة الجوّال"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"خطة الجوّال"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"‏تطبيق الرسائل القصيرة SMS الافتراضي"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏هل تريد تغيير تطبيق الرسائل القصيرة SMS؟"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"‏هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%s</xliff:g> كتطبيق الرسائل القصيرة SMS؟"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"‏مشغل SIM غير معروف"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏ليس لدى %1$s موقع ويب معروف لإدارة حسابات"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏الرجاء إدخال بطاقة SIM وإعادة التشغيل"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"الوضع"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقة عالية"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"توفير شحن البطارية"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"أجهزة استشعار الجهاز فقط"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"الموقع قيد الإيقاف"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"طلبات الموقع الأخيرة"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"لم تطلب أي تطبيقات الوصول إلى الموقع مؤخرًا"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> س <xliff:g id="MINUTES">%2$d</xliff:g> د <xliff:g id="SECONDS">%3$d</xliff:g> ث"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> دقيقة <xliff:g id="SECONDS">%2$d</xliff:g> ثانية"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ث"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> يوم <xliff:g id="HOURS">%2$d</xliff:g> ساعة <xliff:g id="MINUTES">%3$d</xliff:g> دقيقة"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ساعة <xliff:g id="MINUTES">%2$d</xliff:g>دقيقة"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> دقيقة"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"إحصاءات الاستخدام"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"إحصاءات الاستخدام"</string>
     <string name="display_order_text" msgid="8592776965827565271">"تصنيف بحسب:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"الطباعة"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"خدمات الطباعة"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"قد يمر المستند خلال خادم أو أكثر بينما هو في طريقه إلى الطابعة."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"الإعدادات"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"إضافة طابعات"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"إضافة خدمة"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"إضافة طابعة"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"بحث"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"البحث عن طابعات"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"مهام الطباعة"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"مهام الطباعة النشطة"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"البطارية"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ما الذي كان يستخدم البطارية"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"بيانات استخدام البطارية غير متاحة."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"إحصائيات العمليات"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"الإحصائيات التقنية حول العمليات الجارية"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"استخدام الذاكرة"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> من التطبيقات خلال <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"خلفية"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"المقدمة"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"نسخة مخبأة"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ذاكرة الجهاز حاليًا <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"متوسط ​​استخدام ذاكرة الوصول العشوائي"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"الحد الأقصى لاستخدام ذاكرة الوصول العشوائي"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"مدة التشغيل"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"الخدمات"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"إظهار النظام"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"‏استخدام Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع الإحصائيات"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"خلفية"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"المقدمة"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"نسخة مخبأة"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"الإدخال الصوتي والاستماع"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"إعدادات الإدخال الصوتي والاستماع"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"البحث الصوتي"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"لا يمكن المزامنة يدويًا"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"مزامنة هذا العنصر معطّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"‏إعدادات 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"‏إعداد شبكة 4G والمودم وإدراتهما"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"الجيل الرابع"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏عنوان 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"اكتب كلمة المرور لتشفير وحدة التخزين"</string>
     <string name="try_again" msgid="4272075051293936921">"أعد المحاولة."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"حدد أنواع تنبيهات الطوارئ لعرضها."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"قيود التطبيقات والمحتوى"</string>
     <string name="user_rename" msgid="8523499513614655279">"إعادة تسمية"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"تعيين قيود التطبيق"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8b20809..f8d49f2 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -187,7 +187,8 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Пачатак <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Уліковы запіс:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Налады проксі"</string>
+    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
+    <skip />
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ачысціць"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт проксі"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Проксі-сервер для"</string>
@@ -545,24 +546,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укл."</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выкл."</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Выключана"</string>
-    <!-- no translation found for wifi_display_certification_heading (3125105883233765652) -->
-    <skip />
-    <!-- no translation found for wifi_display_session_info (4733627902691604836) -->
-    <skip />
-    <!-- no translation found for wifi_display_listen_mode (2962301785910874273) -->
-    <skip />
-    <!-- no translation found for wifi_display_autonomous_go (140864379216673466) -->
-    <skip />
-    <!-- no translation found for wifi_display_pause (6037110530682927245) -->
-    <skip />
-    <!-- no translation found for wifi_display_resume (8195590160258469425) -->
-    <skip />
-    <!-- no translation found for wifi_display_wps_config (7566565571340705772) -->
-    <skip />
-    <!-- no translation found for wifi_display_listen_channel (4146320990898147857) -->
-    <skip />
-    <!-- no translation found for wifi_display_operating_channel (233535284689144515) -->
-    <skip />
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
@@ -1019,7 +1002,13 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Адбудзецца адключэнне прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мабільныя сеткі"</string>
-    <!-- no translation found for manage_mobile_plan_title (7588182101738043593) -->
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <!-- no translation found for sms_application_title (6134351177937015839) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (8183679628429465443) -->
     <skip />
     <!-- no translation found for mobile_unknown_sim_operator (9101230468757324260) -->
     <skip />
@@ -1036,7 +1025,7 @@
     <skip />
     <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
     <skip />
-    <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
     <skip />
     <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
     <skip />
@@ -1876,8 +1865,8 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Немагчыма сінхранізаваць уручную"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Сінхранізацыя для гэтага элемента зараз адключаная. Каб змяніць налады, часова дазвольце абмен дадзенымі ў фонавым рэжыме і аўтаматычную сінхранізацыю."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Налады 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Наладзіць і кіраваць сеткай 4G і мадэмам"</string>
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
+    <skip />
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адрас"</string>
     <string name="enter_password" msgid="4131758584074246224">"Увядзіце пароль для расшыфроўкі сховiшча"</string>
     <string name="try_again" msgid="4272075051293936921">"Паспрабуйце яшчэ."</string>
@@ -2149,7 +2138,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Мабільнае вяшчанне"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберыце тыпы надзвычайных папярэджанняў для адлюстравання."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Абмежаванні па прыкладаннi і змесціву"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРАЙМЕНАВАЦЬ"</string>
     <!-- no translation found for app_restrictions_custom_label (6160672982086584261) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0ce2c4e..cdaa222 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Установена е връзка"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Свързано (без телефона)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Свързано (без мултимедията)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Има връзка (няма достъп до съобщенията)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Свързано (без телефона или мултимедията)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Изкл."</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Изключва се..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Заявка за свързване чрез Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Докоснете, за да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Заявка за достъп до телефонния указател"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"От %1$s се иска достъп до вашите контакти и история на обажданията. Да се даде ли достъп до %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Без повторно питане"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Без повторно питане"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Заявка за достъп до съобщенията"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Стартиране на <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Профил:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Настройки за прокси сървър"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Прокси сървър"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Изчистване"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт на прокси сървъра"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Заобикаляне на прокси сървъра за"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Входно устройство"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Достъп до интернет"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Достъп до съобщенията"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и мултимедийното аудио ще бъде прекъсната."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и аудиото от „свободни ръце“ ще бъде прекъсната."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Връзката между <xliff:g id="DEVICE_NAME">%1$s</xliff:g> и устройството за въвеждане ще бъде прекъсната."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Установена е връзка с медийно аудио"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Връзка със звука на телефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установена е връзка със сървър за трансфер на файлове"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Има връзка с MAP"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма връзка със сървър за трансфер на файлове"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Има връзка с устройството за въвеждане"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Има връзка с у-во за достъп до интернет"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Използване на за пренос на файлове"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Да се използва за въвеждане"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Използване за достъп до интернет"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Да се използва за MAP"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Настройки за докинг станция"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Използване на докинг аудиостанция"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Като високоговорител"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Вкл."</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Изкл."</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Деактивирано"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертифициране"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Информация за сесията"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Активиране на режима за слушане"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Автономен собственик на група: Акт."</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Пауза"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Възобновяване"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Конфигуриране на WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Канал за слушане"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Работен канал"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешаване на обмен на данни, когато таблетът докосва друго устройство"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка на точката за достъп до Wi‑Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Преносима точка за достъп до Wi‑Fi: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Начало"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Тетърингът на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъснат."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помощ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Управление на мобилния план"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобилен план"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Стандартно приложение за SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Да се промени ли приложението за SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Да се използва ли <xliff:g id="NEW_APP">%s</xliff:g> вместо <xliff:g id="CURRENT_APP">%s</xliff:g> като приложение за SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестен SIM оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Няма известен администриращ уебсайт за %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Моля, поставете SIM карта и рестартирайте"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензорите на устройството"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Местоположението е изключено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Скорошни заявки за местопол."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ч <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>с"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> д <xliff:g id="HOURS">%2$d</xliff:g> ч <xliff:g id="MINUTES">%3$d</xliff:g> мин"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> ч <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Статистически данни за употребата"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистически данни за употребата"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сортиране по:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за отпечатване"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"По пътя към принтера документът ви може да премине през един или повече сървъри."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавяне на принтери"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Добавяне на услуга"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Добавяне на принтер"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Търсене"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Търсят се принтери"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Задания за отпечатване"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Активни задания за печат"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерия"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Какво е използвало батерията"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Няма данни за употр. на батерията."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистически данни за процесите"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Подробни статистически данни за изпълняващите се процеси"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Използвана памет"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Приложения (<xliff:g id="TYPE">%1$s</xliff:g>) за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"заден план"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"преден план"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"кеширани"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Понастоящем състоянието на паметта на устройството е <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Средно използване на RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално използване на RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Време на използване"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуги"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Показване на системните процеси"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Използване на USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистически данни"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Заден план"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Преден план"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кеширани"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Въвеждане и синтезиране на глас"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки за въвеждане и синтезиране на глас"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Гласово търсене"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не може да се синхронизира ръчно"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените настройката, временно включете данните на заден план и автоматичното синхронизиране."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Настройки на 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Настройка и управление на 4G мрежата и модема"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Въведете паролата, за да разшифровате хранилището"</string>
     <string name="try_again" msgid="4272075051293936921">"Опитайте отново."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Деактивирано"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Мрежата може да се наблюдава"</string>
+    <string name="done_button" msgid="1991471253042622230">"Готово"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Наблюдение на мрежата"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Това устройство се управлява от: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nАдминистраторът ви може да наблюдава активността ви в мрежата, включително имейлите, приложенията и сигурните уебсайтове.\n\nЗа повече информация се свържете с него."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Трета страна може да наблюдава активността ви в\nмрежата, включително имейлите, приложенията и сигурните уебсайтове.\n\nТова е възможно благодарение на инсталирани на устройството ви надеждни идентификационни данни."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Проверка на надеждните идентификационни данни"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавяне на потр. или потр. профил"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Деинсталиране на това приложение"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройката засяга всички потребители на този таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Профил за съдържание"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Прилож. и съдържание: Ограничения"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУВАНЕ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ограничения за приложения: Задаване"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c96d037..ff9fb34 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connectats (sense telèfon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connectat (sense fitxers multimèdia)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connectat (no hi ha accés als missatges)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connectat (sense telèfon o disp. mult.)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Sol·licitud de connexió de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca per connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vols connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Sol·licitud d\'accés a la llibreta de telèfons"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A %1$s li agradaria accedir als teus contactes i a l\'historial de trucades. Vols donar accés a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No m\'ho tornis a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No m\'ho tornis a preguntar"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Sol·licitud d\'accés al missatge"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuració de data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inicia <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Compte:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Configuració del servidor intermediari"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Servidor intermediari"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Esborra"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port del servidor intermediari"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Servidor intermediari de derivació de"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositiu d\'entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accés a Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accés al missatge"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio del mitjà."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà de l\'àudio de mans lliures."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> es desconnectarà del dispositiu d\'entrada."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a l\'àudio del mitjà"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connectat a un mapa"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilitza per al mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús de la base per a àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desactivada"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificació"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informació de la sessió"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Activa el mode per escoltar"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Activa GO autònom"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Atura"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reprèn"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuració de WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canal per escoltar"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal operatiu"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan la tauleta toqui un altre dispositiu"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura la zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portàtil"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Es desactivarà l\'ancoratge de xarxa de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestiona el pla per a mòbils"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pla mòbil"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicació per a SMS predeterminada"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> en comptes de <xliff:g id="CURRENT_APP">%s</xliff:g> com a aplicació per a SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconegut"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no té cap lloc web d\'administració conegut"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insereix la targeta SIM i reinicia"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Només sensors de dispositiu"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicació desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Sol·licituds d\'ubicació recents"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Cap aplicació ha sol·licitat la ubicació recentment"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadístiques d\'ús"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadístiques d\'ús"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordena per:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impressió"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serveis d\'impressió"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"És possible que el teu document passi per un o més servidors abans d\'arribar a la impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuració"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Afegeix impressores"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Afegeix un servei"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Afegeix una impressora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Cerca"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"S\'estan cercant impressores"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tasques d\'impressió"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Tasques impressió actives"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dades d\'ús de bateria no disp."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadístiques sobre processos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadístiques sobre els processos en execució"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ús de la memòria"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplicacions durant <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Fons"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Primer pla"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Memòria"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En aquests moments la memòria del dispositiu és <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ús mitjà de RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ús màxim de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Temps d\'execució"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serveis"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostra el sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Fes servir Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipus d\'estadístiques"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Primer pla"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Memòria"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada i sortida de veu"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuració d\'entrada i sortida de veu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Cerca per veu"</string>
@@ -1696,10 +1665,10 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactiva"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradors del dispositiu"</string>
     <string name="no_device_admins" msgid="702695100241728775">"No hi ha cap administrador del dispositiu disponible"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Voleu activar l\'administrador del dispositiu?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Activar l\'administrador del dispositiu?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Activa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador del dispositiu"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"L\'activació d\'aquest administrador permetrà a l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dur a terme les operacions següents:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"En activar aquest administrador, es permetrà que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dugui a terme les operacions següents:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Aquest administrador està actiu i permet que l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> dugui a terme les operacions següents:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sense títol"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
@@ -1746,7 +1715,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Desactiva dades segon pla?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Desactivar les dades en segon pla augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Sincr. autom. dades de l\'aplicació"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Sincronitza dades aplicacions autom."</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sense sincronització"</string>
     <string name="sync_error" msgid="5060969083117872149">"Error de sincronització"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"configuració 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configura i gestiona la xarxa i el mòdem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escriu la contrasenya per desxifrar l\'emmagatzematge"</string>
     <string name="try_again" msgid="4272075051293936921">"Torna-ho a provar."</string>
@@ -1883,7 +1851,7 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronització automàtica?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es reflectiran automàticament a la tauleta.\n\nAlguns comptes com ara els comptes de Google també reflectiran al web els canvis que facis a la tauleta.\n\nPer triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Els canvis que facis als teus comptes al web es reflectiran automàticament al telèfon.\n\nAlguns comptes, com ara els comptes de Google, també reflectiran al web els canvis que hagis fet al telèfon.\n\nPer triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vols desactivar sinc. au. dades?"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar sincronització automàtica?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Es conservaran les dades i l\'ús de bateria, però hauràs de sincronitzar els comptes manualment per recopilar la informació recent. I no rebràs notificacions quan hi hagi actualitzacions."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restabliment del cicle d\'ús"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mes:"</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivat"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissiu"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Pot ser que la xarxa se supervisi."</string>
+    <string name="done_button" msgid="1991471253042622230">"Fet"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Supervisió de xarxes"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"<xliff:g id="MANAGING_DOMAIN">%s</xliff:g> gestiona aquest dispositiu.\n\nEl teu administrador té capacitat per supervisar la teva activitat de xarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nPer obtenir més informació, contacta amb l\'administrador."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tercer té la capacitat per supervisar la teva activitat de\nxarxa, inclosos els correus electrònics, les aplicacions i els llocs web segurs.\n\nHi ha una credencial de confiança instal·lada que fa que això sigui possible."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Comprova les credencials de confiança"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Afegeix un usuari o un perfil"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacions amb restriccions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Amplia configuració aplicació"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Desinstal·la aquesta aplicació"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restriccions d\'aplicacions i de contingut"</string>
     <string name="user_rename" msgid="8523499513614655279">"CANVIA EL NOM"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Defineix les restriccions d\'aplicacions"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a7e07d6..d1454fe 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Připojeno (žádný telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Připojeno (žádná média)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Připojeno (bez přístupu ke zprávám)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Připojeno (žádný telefon nebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Odpojování..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Požadavek na připojení zařízení Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Klepnutím se připojíte k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete se připojit k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Požadavek na přístup k telefonnímu seznamu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zařízení %1$s žádá o přístup k vašim kontaktům a historii hovorů. Povolit zařízení %2$s přístup?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Příště se neptat"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Příště se neptat"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Požadavek na přístup ke zprávám"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Spustit činnost <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Účet:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavení serveru proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazat"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívat server proxy pro"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupní zařízení"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Přístup k internetu"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Přístup ke zprávám"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku médií."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od zvuku sady handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno od vstupního zařízení."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Připojeno k mapě"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Připojeno ke vstupnímu zařízení"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Připojeno k zařízení za účelem přístupu k internetu"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použít pro vstup"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použít pro přístup k internetu"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použít pro mapu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavení doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použít zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certifikace"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informace o relaci"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Povolit režim naslouchání"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Povolit autonomního vlastníka skupiny"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pozastavit"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Spustit znovu"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfigurace WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanál pro naslouchání"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Provozní kanál"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavit hotspot sítě Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Přenosný hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Správa mobilního tarifu"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilní tarif"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Výchozí aplikace SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Chcete změnit aplikaci SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Chcete místo současné aplikace SMS <xliff:g id="CURRENT_APP">%s</xliff:g> použít aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámý operátor SIM karty"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žádný známý web pro správu účtů."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká přesnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Pouze senzory zařízení"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Poloha vypnuta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávné žádosti o určení polohy"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslední době žádné aplikace o polohu nepožádaly."</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika použití"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika použití"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Řadit podle:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Tisk"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskové služby"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Chcete použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokument může cestou do tiskárny projít jedním i více servery."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavení"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Přidat tiskárny"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Přidat službu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Přidat tiskárnu"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Vyhledávání"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Vyhledávání tiskáren"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tiskové úlohy"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktivní tiskové úlohy"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotřebě nejsou známy."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné statistiky běžících procesů"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikace typu <xliff:g id="TYPE">%1$s</xliff:g> za <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Na pozadí"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Na popředí"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"V mezipaměti"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuální stav paměti zařízení: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Průměrné využití paměti RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Minimální využití paměti RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Doba běhu"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Zobrazit systém"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Použít USS (jedinečnou velikost sady)"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statistik"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadí"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Na popředí"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"V mezipaměti"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Hlasový vstup a výstup"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavení hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhledávání"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavení sítě 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavení a správa sítě 4G a modemu"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Chcete-li obsah úložiště dešifrovat, zadejte heslo."</string>
     <string name="try_again" msgid="4272075051293936921">"Zkuste to znovu."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázáno"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Mírné"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Síť může být monitorována"</string>
+    <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorování sítě"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Toto zařízení je spravováno doménou <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nSprávce může monitorovat aktivitu v síti, včetně e-mailů, aplikací a zabezpečených webů.\n\nDalší informace vám sdělí správce."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Vaše aktivita v síti, včetně e-mailů, aplikací a zabezpečených\nwebových stránek může být monitorována třetí stranou.\n\nUmožňují to důvěryhodné identifikační údaje nainstalované ve vašem zařízení."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Zkontrolovat důvěryhodné identifikační údaje"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Přidat uživatele nebo profil"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Povolit aplikace a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikace s omezením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbalit nastavení aplikace"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Odinstalovat aplikaci"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasílání zpráv v rámci buňky"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy mimořádných upozornění, která chcete zobrazovat."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Omezení aplikací a obsahu"</string>
     <string name="user_rename" msgid="8523499513614655279">"PŘEJMENOVAT"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastavit omezení aplikací"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6c36ba3..042e8f6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyindstillinger"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ryd"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-port"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Brug ikke proxy til"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Til"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Fra"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiveret"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificering"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Oplysninger om session"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktivér lyttetilstand"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktivér autonom GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Sæt på pause"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Genoptag"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-konfiguration"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Lyttekanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Igangværende kanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrer mobilabonnement"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Standard sms-app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du skifte sms-app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%s</xliff:g> som din sms-applikation?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kortudbyderen er ukendt"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har intet kendt website til provisionering"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tilstand"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høj nøjagtighed"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batteribesparelse"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Kun enhedens sensorer"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Placering fra"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Seneste placeringsanmodninger"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apps har anmodet om placering for nylig"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>S"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Brugerstatistikker"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Brugerstatistikker"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorter efter:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Udskrivningstjenester"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dit dokument går muligvis gennem én eller flere servere på vej til printeren."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Indstillinger"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tilføj printere"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tilføj tjeneste"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tilføj printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Søg"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Søger efter printere"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Udskriftsjobs"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktive udskriftsjobs"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hvad der har brugt batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribrugsdata utilgængeligt."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistikker"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nørdede statistikker om kørende processer"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>-apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Baggrund"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Forgrund"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Cachelagret"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhedens hukommelse er i øjeblikket <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gennemsnitligt RAM-forbrug"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalt RAM-forbrug"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Visningstid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Vis systemet"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Brug Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktype"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Baggrund"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Forgrund"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cachelagret"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Stemmeinput og -output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Indstillinger for stemmeinput og -output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemmesøgning"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Der kan ikke synkroniseres manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering af dette element er deaktiveret lige nu. Hvis du vil ændre indstillingen, skal du aktivere baggrundsdata og automatisk synkronisering midlertidigt."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Indstillinger for 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-netværk og -modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Indtast en adgangskode for at dekryptere lageret"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv igen."</string>
@@ -2010,7 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Udvid indstillingerne for applikationen"</string>
-    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Afinstaller dette applikation"</string>
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Afinstaller denne applikation"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne indstilling påvirker alle brugere på denne tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
@@ -2018,7 +1993,7 @@
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Betalinger"</string>
     <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vil du angive dette som din præference?"</string>
-    <string name="nfc_payment_set_default" msgid="5427393822785989090">"VIl du altid bruge <xliff:g id="APP">%1$s</xliff:g>, når du bruger peg og betal?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"Vil du altid bruge <xliff:g id="APP">%1$s</xliff:g>, når du bruger peg og betal?"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"Vil du altid bruge <xliff:g id="APP_0">%1$s</xliff:g> i stedet for <xliff:g id="APP_1">%2$s</xliff:g>, når du bruger peg og betal?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobilmeddelelser"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vælg de typer af nødalarmer, der skal vises."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Begrænsninger af apps og indhold"</string>
     <string name="user_rename" msgid="8523499513614655279">"OMDØB"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Angiv begrænsninger for appen"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index a5ea6ea..ef4e701 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -446,10 +446,10 @@
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
-    <item msgid="4810006996171705398">"Höchstens ein Prozess"</item>
-    <item msgid="8586370216857360863">"Höchstens zwei Prozesse"</item>
-    <item msgid="836593137872605381">"Höchstens drei Prozesse"</item>
-    <item msgid="7899496259191969307">"Höchstens vier Prozesse"</item>
+    <item msgid="4810006996171705398">"Höchstens 1 Prozess"</item>
+    <item msgid="8586370216857360863">"Höchstens 2 Prozesse"</item>
+    <item msgid="836593137872605381">"Höchstens 3 Prozesse"</item>
+    <item msgid="7899496259191969307">"Höchstens 4 Prozesse"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP-VPN"</item>
@@ -473,9 +473,9 @@
     <item msgid="1417929597727989746">"Immer zulassen"</item>
   </string-array>
   <string-array name="ram_states">
-    <item msgid="7088762389498381203">"Normal"</item>
-    <item msgid="4517779899383204000">"Mittel"</item>
-    <item msgid="406385694840950802">"Niedrig"</item>
-    <item msgid="4212263919458209842">"Kritisch"</item>
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"mittel"</item>
+    <item msgid="406385694840950802">"niedrig"</item>
+    <item msgid="4212263919458209842">"kritisch"</item>
   </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7ac734f..e05f8ee 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-Einstellungen"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Löschen"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-Port"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Umgehung des Proxys für"</string>
@@ -535,15 +535,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"An"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Aus"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiviert"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Zertifizierung"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Sitzungsinformationen"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Empfangsmodus aktivieren"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Autonomen GO aktivieren"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pausieren"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Fortsetzen"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-Konfiguration"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Empfangskanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Übertragungskanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
@@ -999,7 +990,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobildatentarif verwalten"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Standard-SMS-App"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS-App wechseln?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"<xliff:g id="NEW_APP">%s</xliff:g> statt <xliff:g id="CURRENT_APP">%s</xliff:g> als SMS-App verwenden?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unbekannter SIM-Anbieter"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Keine Bereitstellungs-Website für %1$s bekannt"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Legen Sie die SIM ein und starten das Gerät neu."</string>
@@ -1008,7 +1002,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Stromsparfunktion"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Nur Gerätesensoren"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Standort aus"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Letzte Standortanfragen"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Keine App hat kürzlich den Standort abgefragt."</string>
@@ -1333,16 +1328,16 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Autorisierungen für USB-Debugging aufheben"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Fehlerberichte im Menü \"Akku\""</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Akku\" hinzu"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Fehlerberichte im Menü \"Ein/Aus\""</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Ein/Aus\" hinzu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
     <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
-    <string name="select_runtime_title" msgid="649783802363155346">"Laufzeit auswählen"</string>
-    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit auswählen"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Laufzeit festlegen"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit festlegen"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
-    <string name="wifi_display_certification" msgid="8611569543791307533">"Zertifizierung für kabellose Übertragung"</string>
+    <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</string>
@@ -1372,12 +1367,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Nutzungsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Nutzungsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortieren nach:"</string>
@@ -1444,8 +1436,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Drucken"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Druckdienste"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Ihr Dokument passiert bei der Übermittlung an den Drucker möglicherweise einen oder mehrere Server."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Einstellungen"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Drucker hinzufügen"</string>
@@ -1454,12 +1445,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dienst hinzufügen"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Drucker hinzufügen"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Suchen"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Suche nach Druckern…"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Druckaufträge"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktive Druckaufträge"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Keine Daten zum Akkuverbrauch"</string>
@@ -1539,33 +1527,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozessstatistiken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiken zu laufenden Prozessen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Speichernutzung"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Apps (<xliff:g id="TYPE">%1$s</xliff:g>) über <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Hintergrund"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Vordergrund"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Im Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Der aktuelle Speicherstand des Geräts ist <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Durchschnittliche RAM-Nutzung"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximale RAM-Nutzung"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Laufzeit"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Systemprozesse anzeigen"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"USS verwenden"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Hintergrund"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Vordergrund"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Im Cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Spracheingabe&amp;-ausgabe"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Einstellungen für Spracheingabe &amp; -ausgabe"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Sprachsuche"</string>
@@ -1773,8 +1749,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Manuelle Synchronisierung nicht möglich"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Die Synchronisierung hierfür ist deaktiviert. Zur Änderung dieser Einstellung aktivieren Sie vorübergehend Hintergrunddaten und automatische Synchronisierung."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-Einstellungen"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-Netzwerk einrichten &amp; verwalten"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Passwort zum Entschlüsseln des Speichers eingeben"</string>
     <string name="try_again" msgid="4272075051293936921">"Erneut versuchen"</string>
@@ -1784,9 +1759,9 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Alles auswählen"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-Prüfung"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-Prüfverhalten festl."</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-Prüfverhalten festlegen"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"Debugging"</string>
-    <string name="debug_app" msgid="8349591734751384446">"Debugging-App auswählen"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Debugging-App festlegen"</string>
     <string name="debug_app_not_set" msgid="718752499586403499">"Keine Debugging-App festgelegt"</string>
     <string name="debug_app_set" msgid="2063077997870280017">"Debugging-App: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="select_application" msgid="5156029161289091703">"App auswählen"</string>
@@ -1805,7 +1780,7 @@
     <string name="show_touches_summary" msgid="6684407913145150041">"Visuelles Feedback für Berührungen anzeigen"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Oberflächenaktualisierungen"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash für gesamte Fensteroberfläche bei Aktualisierung"</string>
-    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Updates m. GPU-Ansicht"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Updates mit GPU-Ansicht"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardwareebenen-Updates"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwareebenen blinken beim Aktualisieren grün"</string>
@@ -2029,7 +2004,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Beschränkungen für Apps und Inhalte"</string>
     <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-Beschränkungen festlegen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ec40216..04860ec 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Εκκίνηση <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Λογαριασμός:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Ρυθμίσεις διακομιστή μεσολάβησης"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Διακομιστής μεσολάβησης"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Εκκαθάριση"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Θύρα διακομιστή μεσολάβησης"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Διακομιστής μεσολάβησης παράκαμψης για"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ενεργή"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ανενεργή"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Έχει απενεργοποιηθεί"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Πιστοποίηση"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Πληροφορίες περιόδου σύνδεσης"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Ενεργοποίηση λειτουργίας ακρόασης"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Ενεργοποίηση αυτόνομου GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Παύση"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Συνέχιση"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Διαμόρφωση WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Ακρόαση καναλιού"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Λειτουργικό κανάλι"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Διαχείριση προγρ. κινητής τηλ."</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Πρόγραμμα κινητής τηλεφωνίας"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Προεπιλεγμένη εφαρμογή SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Αλλαγή εφαρμογής SMS;"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Χρήση της εφαρμογής <xliff:g id="NEW_APP">%s</xliff:g> αντί για την εφαρμογή <xliff:g id="CURRENT_APP">%s</xliff:g> ως εφαρμογής SMS;"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Άγνωστος τελεστής SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s δεν διαθέτει γνωστό ιστότοπο παροχής"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Εισαγάγετε την κάρτα SIM και κάντε επανεκκίνηση"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Λειτουργία"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Υψηλή ακρίβεια"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Εξοικονόμησης μπαταρίας"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Μόνο αισθητήρες συσκευής"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Τοποθεσία απενεργοποιημένη"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Καμία εφαρμογή δεν ζήτησε πρόσφατα την τοποθεσία σας."</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ω <xliff:g id="MINUTES">%2$d</xliff:g>λ <xliff:g id="SECONDS">%3$d</xliff:g>δ"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>λ <xliff:g id="SECONDS">%2$d</xliff:g>δ"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>δ"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>μ <xliff:g id="HOURS">%2$d</xliff:g>ω <xliff:g id="MINUTES">%3$d</xliff:g>λ"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ω <xliff:g id="MINUTES">%2$d</xliff:g>λ"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>λ"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Στατιστικά χρήσης"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Στατιστικά χρήσης"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ταξινόμηση με βάση:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Υπηρεσίες εκτύπωσης"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Το έγγραφό σας μπορεί να περάσει από έναν ή περισσότερους διακομιστές κατά τη μετάβαση στον εκτυπωτή."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ρυθμίσεις"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Προσθήκη εκτυπωτών"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Προσθήκη υπηρεσίας"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Προσθήκη εκτυπωτή"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Αναζήτηση"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Αναζήτηση για εκτυπωτές"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Εργασίες εκτύπωσης"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Ενεργές εργασίες εκτύπωσης"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Μπαταρία"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Τι χρησιμοποιούσε την μπαταρία"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Μη διαθέσιμα δεδ. χρήσ. μπατ."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Στατιστικά στοιχεία διαδικασίας"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Χρήσιμα στατιστικά στοιχεία σχετικά με τις εκτελούμενες διαδικασίες"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Χρήση μνήμης"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Εφαρμογές <xliff:g id="TYPE">%1$s</xliff:g> για διάστημα <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Φόντο"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Προσκήνιο"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Αποθηκευμένο στην κρυφή μνήμη"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Αυτήν τη στιγμή η μνήμη της συσκευής είναι <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Μέση χρήση RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Μέγιστη χρήση RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Χρόνος εκτέλεσης"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Υπηρεσίες"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Εμφάνιση συστήματος"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Χρήση Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Τύπος στατιστικών στοιχείων"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Φόντο"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Προσκήνιο"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Αποθηκευμένο στην κρυφή μνήμη"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Φωνητική είσοδος/έξοδος"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ρυθμίσεις φωνητικής εισόδου και εξόδου"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Φωνητική αναζήτηση"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Δεν είναι δυνατός ο μη αυτόματος συγχρονισμός"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ο συγχρονισμός για αυτό το στοιχείο είναι προς το παρόν απενεργοποιημένος. Για να αλλάξετε τη ρύθμισή σας, ενεργοποιήστε προσωρινά τα δεδομένα παρασκηνίου και τον αυτόματο συγχρονισμό."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ρυθμίσεις 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Εγκατάσταση και διαχείριση δικτύου και μόντεμ 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Εισαγάγετε κωδικό πρόσβασης για την αποκρυπτογράφηση του αποθηκευτικού χώρου"</string>
     <string name="try_again" msgid="4272075051293936921">"Δοκιμάστε ξανά."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Λογαριασμός για περιεχόμενο"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Εκπομπές κινητής τηλεφωνίας"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Επιλέξτε τους τύπους ειδοποιήσεων έκτακτης ανάγκης που θα εμφανίζονται."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Περιορισμοί εφαρμογών, περιεχομένου"</string>
     <string name="user_rename" msgid="8523499513614655279">"ΜΕΤΟΝΟΜΑΣΙΑ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ορισμός περιορισμών εφαρμογής"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0c3b228..6f0c0d9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy settings"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy port"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy for"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"On"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Off"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disabled"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certification"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Session info"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Enable listen mode"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Enable autonomous GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pause"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Resume"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS configuration"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Listen channel"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operating channel"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Manage mobile plan"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Use <xliff:g id="NEW_APP">%s</xliff:g> instead of <xliff:g id="CURRENT_APP">%s</xliff:g> as your SMS application?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unknown SIM operator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Device sensors only"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Add printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Search"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Searching for printers"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Print jobs"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Active print jobs"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Background"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Foreground"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Cached"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average RAM use"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Foreground"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cached"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Voice input &amp; output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G settings"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Set up &amp; manage 4G network and modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Try again."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Application and content restrictions"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Set app restrictions"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0c3b228..6f0c0d9 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy settings"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Clear"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy port"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy for"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"On"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Off"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disabled"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certification"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Session info"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Enable listen mode"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Enable autonomous GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pause"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Resume"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS configuration"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Listen channel"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operating channel"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Manage mobile plan"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Default SMS app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Use <xliff:g id="NEW_APP">%s</xliff:g> instead of <xliff:g id="CURRENT_APP">%s</xliff:g> as your SMS application?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unknown SIM operator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Device sensors only"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Usage statistics"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Usage statistics"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sort by:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Your document may pass through one or more servers on its way to the printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Add printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Search"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Searching for printers"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Print jobs"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Active print jobs"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Background"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Foreground"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Cached"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average RAM use"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Foreground"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cached"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Voice input &amp; output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G settings"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Set up &amp; manage 4G network and modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Try again."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Application and content restrictions"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Set app restrictions"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 859cad5..0f990df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sin acceso a mensajes)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin tel. ni audio multimedia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Deseas conectarte a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitud de acceso a agenda telefónica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desea acceder a tus contactos y a tu historial de llamadas. ¿Deseas darle acceso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No volver a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitud de acceso a mensajes"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inicio <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cuenta:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Configuración de proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Eliminar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltar proxy para"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio multimedia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del dispositivo de entrada."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio multimedia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del dispositivo"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado al mapa"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado a un dispositivo para acceder a Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acceso a Internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuración de la base"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizar la base para el audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificación"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Información de la sesión"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Habilitar modo de escucha"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Habilitar GO autónomo"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Detener"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reanudar"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuración de WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canal de escucha"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal operativo"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tablet entre en contacto con otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi‑Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrar plan móvil"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Quieres cambiar la aplicación de SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%s</xliff:g> como la aplicación de SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio de aprovisionamiento."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia."</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precisión alta"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensores del dispositivo"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicación desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicit. ubicación recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación solicitó la ubicación recientemente."</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g>seg"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> seg"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Es posible que el documento pase por uno o varios servidores antes de imprimirse."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuración"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Agregar impresoras"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Agregar servicio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Agregar impresora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Buscando impresoras"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Trabajos de impresión"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Trabaj. impresión activos"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Sin datos de uso de batería"</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas para geeks sobre procesos activos"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicaciones <xliff:g id="TYPE">%1$s</xliff:g> durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"En el fondo"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"En primer plano"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"En caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En este momento, el estado de la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso promedio de RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tiempo de ejecución"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadística"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En el fondo"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"En primer plano"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"En caché"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos en segundo plano y la sincronización automática."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Configuración de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar &amp; administrar red 4G y módem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escribe la contraseña para desencriptar el almacenamiento"</string>
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
@@ -2017,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicaciones y contenido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicaciones con restricciones"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. a aplicación"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Desinstalar esta aplicación"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
@@ -2026,8 +1993,8 @@
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Pagos"</string>
     <string name="nfc_payment_no_apps" msgid="5518479703188056016">"NO TRADUCIR"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"¿Establecer como preferencia?"</string>
-    <string name="nfc_payment_set_default" msgid="5427393822785989090">"¿Utilizar siempre <xliff:g id="APP">%1$s</xliff:g> al tocar y pagar?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"¿Utilizar siempre <xliff:g id="APP_0">%1$s</xliff:g> en lugar de <xliff:g id="APP_1">%2$s</xliff:g> al tocar y pagar?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"¿Quieres usar <xliff:g id="APP">%1$s</xliff:g> siempre al tocar y pagar?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"¿Quieres usar siempre <xliff:g id="APP_0">%1$s</xliff:g> en lugar de <xliff:g id="APP_1">%2$s</xliff:g> al tocar y pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
@@ -2036,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emisiones móviles"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia para mostrar."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restricción de aplicación/contenido"</string>
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restricciones de aplicación"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1cc4a98..48521a8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cuenta:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Ajustes de proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Puerto proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omitir proxy para"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificación"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Información de la sesión"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Habilitar modo de escucha"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Habilitar GO autónomo"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Detener"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reanudar"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuración de WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canal de escucha"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal operativo"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir intercambio de datos cuando el tablet toque otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrar plan móvil"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Cambiar aplicación de SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%s</xliff:g> como aplicación de SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio web de aprovisionamiento"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia el dispositivo"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensores del dispositivo"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicacación desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicación recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estadísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Es posible que el documento pase por uno o varios servidores antes de imprimirse."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ajustes"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Añadir impresoras"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Añadir servicio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Añadir impresora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Buscando impresoras"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Trabajos de impresión"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Trabajos de impresión activos"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Los datos de uso de la batería no están disponibles"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicaciones <xliff:g id="TYPE">%1$s</xliff:g> durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"En segundo plano"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"En primer plano"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"En caché"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso de RAM medio"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso de RAM máximo"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadísticas"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"En segundo plano"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"En primer plano"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"En caché"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede hacer la sincronización de forma manual."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente las conexiones automáticas y la sincronización automática."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ajustes de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar y gestionar módem y red 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduce la contraseña para descifrar el almacenamiento."</string>
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mensajes de radiodifusión"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restricciones contenido/aplicaciones"</string>
     <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restricciones de aplicación"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index db4e587..e855563 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Käivita <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Puhverserveri seaded"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Puhverserver"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Kustuta"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Puhverserveri port"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Puhverserverist mööduvad"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Sees"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Väljas"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Keelatud"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifitseerimine"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Seansi teave"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Luba kuulamisrežiim"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Luba sõltumatu GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Peata"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Jätka"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-i seadistus"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kuulamiskanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Juhtimiskanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiilsidevõrgud"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobiilipaketi haldamine"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"SMS-i vaikerakendus"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Kas muuta SMS-i rakendust?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Kas kasutada SMS-i rakendusena rakenduse <xliff:g id="CURRENT_APP">%s</xliff:g> asemel rakendust <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kaardi tundmatu operaator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operaatoril %1$s pole teenusepakkumise veebisaite"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sisestage SIM-kaart ja taaskäivitage"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režiim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Väga täpne"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aku säästmine"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Ainult seadme andurid"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Asukoht on väljas"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Hiljutised asukohapäringud"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> p <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Kasutusstatistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Kasutusstatistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortimisalus:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Printimine"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Printimisteenused"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Printerini jõudmiseks võib dokument läbida ühe või mitu serverit."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Seaded"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printerite lisamine"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Lisa teenus"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Lisa printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Otsing"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Printerite otsimine"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Prinditööd"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktiivsed prinditööd"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mis on akut kasutanud"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Aku andmed pole saadaval."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Protsessi statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Tehnilised üksikasjad protsesside käitamise kohta"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mälu kasutamine"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Tüüpi <xliff:g id="TYPE">%1$s</xliff:g> rakendused perioodi <xliff:g id="TIME">%2$s</xliff:g> jooksul"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Taust"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Esiplaan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Vahemälus"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Seadme mälu on olekus <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-i keskmine kasutus"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-i maksimaalne kasutus"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tööaeg"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Teenused"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Süsteemi kuvamine"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"USS-i kasutamine"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika tüüp"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Taust"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Esiplaan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Vahemälus"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Kõnesisend ja -väljund"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kõnesisendi ja -väljundi seaded"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Häälotsing"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G seaded"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Seadistage ja hallake 4G võrku ning modemit"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Mälu dekrüpteerimiseks sisestage parool"</string>
     <string name="try_again" msgid="4272075051293936921">"Proovige uuesti."</string>
@@ -1803,7 +1778,7 @@
     <string name="show_touches" msgid="1356420386500834339">"Näita puuteid"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Kuva visuaalset tagasisidet puudete kohta"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Näita pinna värskendusi"</string>
-    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Akna pinna värskendam. kirjuta kogu akna pind üle"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Akna pinna värskendamiseks kirjuta kogu akna pind üle"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Näita GPU kuva värskend."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU-ga joonistades kirjuta akende kuvad üle"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Kuva riistv. kiht. värsk."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Rakenduste ja sisu piirangud"</string>
     <string name="user_rename" msgid="8523499513614655279">"NIMETA ÜMBER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Rakendusele piirangute määramine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dca2479..428a421 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -133,7 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل شد (بدون تلفن)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل شد (بدون رسانه)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"متصل (فاقد دسترسی به پیام)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"متصل (عدم دسترسی به پیام)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل شد (بدون تلفن یا رسانه)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"اتصال قطع شد"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"در حال قطع اتصال..."</string>
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"شروع <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"حساب:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"تنظیمات پروکسی"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"پروکسی"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"پاک کردن"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"درگاه پروکسی"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"‏پروکسی Bypass برای"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"روشن"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"خاموش"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"غیرفعال شد"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"گواهینامه"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"اطلاعات جلسه"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"فعال کردن حالت گوش دادن"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"‏فعال کردن GO مستقل"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"توقف موقت"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"ازسرگیری"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"‏پیکربندی WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"کانال شنیداری"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"کانال اجراکننده"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"تبادل داده هنگامیکه رایانهٔ لوحی در تماس با دستگاه دیگر است مجاز باشد"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس می‌کند"</string>
@@ -629,7 +620,7 @@
     <string name="wifi_ip_settings" msgid="3359331401377059481">"‏تنظیمات IP"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(بدون تغییر)"</string>
     <string name="wifi_unspecified" msgid="5431501214192991253">"(مشخص نشده)"</string>
-    <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره شد"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره‌شده"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"از اتصال به اینترنت ضعیف اجتناب شد"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اتصال اینترنتی با تلفن همراه قطع می‌شود."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبکه‌های تلفن همراه"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"مدیریت طرح تلفن همراه"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"طرح تلفن همراه"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"برنامه پیامک پیش‌فرض"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"برنامه پیامک تغییر داده شود؟"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"از <xliff:g id="NEW_APP">%s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%s</xliff:g> به‌عنوان برنامه پیامک‌تان استفاده می‌کنید؟"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"شرکت مخابراتی ارائه دهنده سیم کارت ناشناس است"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏%1$s وب‌سایت شناخته‌شده‌ای برای آماده‌سازی ندارد."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"لطفاً سیم کارت را وارد کنید و دوباره راه‌اندازی کنید"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"حالت"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقت زیاد"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"صرفه‌جویی در باتری"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"فقط حسگرهای دستگاه"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"موقعیت مکانی خاموش"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"درخواست‌های اخیر موقعیت مکانی"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"به تازگی هیچ برنامه‌ای موقعیت مکانی را درخواست نکرده است"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت و <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه و <xliff:g id="SECONDS">%3$d</xliff:g> ثانیه"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>دقیقه و <xliff:g id="SECONDS">%2$d</xliff:g> ثانیه"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ثانیه"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> روز و <xliff:g id="HOURS">%2$d</xliff:g> ساعت و <xliff:g id="MINUTES">%3$d</xliff:g> دقیقه"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت و <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> دقیقه"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"آمار کاربرد"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"آمار کاربرد"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ترتیب بر اساس:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"خدمات چاپ"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ممکن است سند شما برای رسیدن به چاپگر از یک یا چند سرور عبور کند."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"تنظیمات"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"افزودن چاپگرها"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"افزودن سرویس"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"افزودن چاپگر"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"جستجو"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"در حال جستجو برای چاپگرها"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"کارهای چاپی"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"کارهای چاپی فعال"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"باتری"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"چه چیزی باتری را مصرف کرده است"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"اطلاعات مصرف باتری موجود نیست."</string>
@@ -1479,7 +1467,7 @@
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <string name="history_details_title" msgid="3608240585315506067">"اطلاعات سابقه"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
     <string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
     <string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"تنظیم استفاده از نیرو"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"آمار فرآیند"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"آمار دقیق برای فرآیندهای در حال اجرا"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"استفاده از حافظه"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"برنامه‌های <xliff:g id="TYPE">%1$s</xliff:g> در طول <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"پس‌زمینه"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"پیش‌زمینه"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"در حافظه پنهان"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"حافظه دستگاه در حال حاضر <xliff:g id="MEMSTATE">%1$s</xliff:g> است"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"‏میانگین استفاده از RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏حداکثر استفاده از RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"مدت اجرا"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"خدمات"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"نمایش سیستم"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"‏استفاده از Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع آمار"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"پس‌زمینه"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"پیش‌زمینه"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"در حافظه پنهان"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ورودی و خروجی صوتی"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"تنظیمات ورودی و خروجی صوتی"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"جستجوی صوتی"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"نمی‌توان به‌صورت دستی همگام‌سازی کرد"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"همگام‌سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر این تنظیم، داده‌های پس‌زمینه و همگام‌سازی خودکار را موقتاً روشن کنید."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"‏تنظیمات 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"‏تنظیم و مدیریت شبکه 4G و مودم"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏آدرس 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"برای رمزگشایی حافظه گذرواژه را تایپ کنید"</string>
     <string name="try_again" msgid="4272075051293936921">"دوباره امتحان کنید."</string>
@@ -1959,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"غیرفعال"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ممکن است شبکه پایش شود"</string>
+    <string name="done_button" msgid="1991471253042622230">"انجام شد"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"پایش شبکه"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"این دستگاه توسط <xliff:g id="MANAGING_DOMAIN">%s</xliff:g> مدیریت می‌شود.\n\nسرپرستتان می‌تواند فعالیت شبکه شما، از جمله ایمیل‌ها، برنامه‌ها، و وب‌سایت‌های ایمن، را پایش کند.\n\nبرای کسب اطلاعات بیشتر با سرپرستتان تماس بگیرید."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"یک شخص ثالث قادر به پایش فعالیت شبکه شما،\nاز جمله ایمیل‌ها، برنامه‌ها، و وب‌سایت‌های ایمن است.\n\nاعتبارنامه قابل اعتمادی که بر روی دستگاهتان نصب شده این کار را امکان‌پذیر می‌کند."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"بررسی اعتبارنامه‌های قابل اعتماد"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
     <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"افزودن کاربر یا نمایه"</string>
@@ -1994,7 +1963,7 @@
     <string name="user_setup_dialog_message" msgid="614037943337008555">"اطمینان حاصل کنید که فرد برای گرفتن رایانه لوحی و تنظیم فضای خود، در دسترس است"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"اکنون نمایه را تنظیم می‌کنید؟"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"هم اکنون تنظیم شود"</string>
-    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"اکنون خیر"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"الآن نه"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"فقط صاحب رایانه لوحی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"فقط صاحب گوشی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"نمایه‌های محدود نمی‌توانند حسابی را اضافه کنند"</string>
@@ -2034,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"حساب برای محتوا"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکس‌دار"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"پخش‌های سلولی"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"محدودیت‌های محتوا و برنامه"</string>
     <string name="user_rename" msgid="8523499513614655279">"تغییر نام"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"تنظیم محدودیت‌های برنامه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b58bee1..7de6798 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -182,7 +182,8 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Käynnistä <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Tili:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Välityspalvelimen asetukset"</string>
+    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
+    <skip />
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tyhjennä"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Välityspalvelimen portti"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ohita välityspalvelin seuraavasti:"</string>
@@ -534,15 +535,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Käytössä"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ei käytössä"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Ei käytössä"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifiointi"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Istunnon tiedot"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Ota kuuntelutila käyttöön"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Ota autonominen GO käyttöön"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Keskeytä"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Jatka"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-määritykset"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kuuntelukanava"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Käyttökanava"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
@@ -998,7 +990,14 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Hallitse mobiilisopimusta"</string>
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <!-- no translation found for sms_application_title (6134351177937015839) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (8183679628429465443) -->
+    <skip />
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Tuntematon SIM-kortin operaattori"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Ei tunnettua käyttäjien hallintasivustoa: %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
@@ -1007,7 +1006,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tila"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Suuri tarkkuus"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Virransäästötila"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Vain laitteen antureilla"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Sijainti ei käytössä"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Viimeisimmät sijaintipyynnöt"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
@@ -1772,8 +1772,8 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedot ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-asetukset"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Muodosta 4G-verkon ja modeemin asetukset ja hallinnoi niitä"</string>
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
+    <skip />
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="4131758584074246224">"Poista tallennustilan salaus antamalla salasana."</string>
     <string name="try_again" msgid="4272075051293936921">"Yritä uudelleen."</string>
@@ -2028,7 +2028,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcast -lähetykset"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valitse näytettävät hätäilmoitukset."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Sovelluksien ja sisällön rajoituks."</string>
     <string name="user_rename" msgid="8523499513614655279">"NIMEÄ UUDELLEEN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Aseta sovelluksen rajoituksia"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1ec05ce..ea2943b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connecté (sans accès aux messages)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Appuyez pour vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Demande d\'accès au répertoire téléphonique"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne plus me demander"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne plus me demander"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Demande d\'accès aux messages"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s souhaite accéder à vos messages. Autoriser l\'accès à %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Démarrer <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g> :"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"COMPTE"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Paramètres serveur mandataire"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Mandataire"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port du serveur mandataire"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorer le serveur mandataire pour"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio du support."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté de l\'audio en mains libres."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sera déconnecté du périphérique d\'entrée"</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté à l\'audio du support"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté à l\'audio du téléphone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connecté à la carte"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utiliser pour la carte"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Paramètres station d’accueil"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utiliser la station d’accueil pour l\'audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activé"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Désactivé"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Désactivés"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certification"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Détails de la session"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Activer le mode d\'écoute"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Activer GO autonome"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Suspendre"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reprendre"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuration WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canal d\'écoute"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal de fonctionnement"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone est en contact avec un autre appareil"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"DISPLAY"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage de connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gérer le forfait mobile"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait de données cellulaires"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Application de texto par défaut"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application de messagerie texte?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%s</xliff:g> comme application de messagerie texte?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Opérateur SIM inconnu"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Aucun site Web de configuration connu pour %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économiser la pile"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Capteurs appareil uniquement"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> mn <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> mn <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Trier par :"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Votre document peut passer par un ou plusieurs serveurs avant d\'arriver à l\'imprimante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter le service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ajouter une imprimante"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Rechercher"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Recherche d\'imprimantes en cours..."</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tâches d\'impression"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Tâches impression actives"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques des processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées sur les processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mémoire utilisée"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Applications <xliff:g id="TYPE">%1$s</xliff:g> en <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Arrière-plan"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Avant-plan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"En cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"L\'état de la mémoire de l\'appareil est actuellement : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Taux d\'utilisation moyen de la mémoire vive"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la mémoire vive"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Afficher le système"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Utiliser USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Avant-plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"En cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Saisie et sortie vocales"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Paramètres 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurer et gérer le réseau et le modem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Réessayer."</string>
@@ -1968,18 +1936,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Désactivé"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Le réseau peut être surveillé"</string>
+    <string name="done_button" msgid="1991471253042622230">"Terminé"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Surveillance réseau"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Cet appareil est géré par : <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nVotre administrateur est en mesure de surveiller l\'activité de votre réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour obtenir plus d\'information à ce sujet, communiquez avec votre administrateur."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Un tiers peut surveiller votre activité réseau,\n y compris les courriels, les applications et les sites Web sécurisés.\n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Vérifier les certificats de confiance"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Ajouter un utilisateur ou un profil"</string>
@@ -2025,8 +1987,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Autoriser des applications et des contenus"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications avec restrictions"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Développer paramètres applis"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Désinstaller cette application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
@@ -2044,7 +2005,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Limitations accès applis et contenu"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Définir des restrictions d\'applis"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 570d7a4..8f71702 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Démarrer <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Compte :"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Paramètres proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Effacer"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port du proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorer le proxy pour"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activé"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Désactivé"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Désactivé"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certification"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informations sur la session"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Activer le mode d\'écoute"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Activer GO autonome"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Interrompre"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reprendre"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuration WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Chaîne d\'écoute"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Chaîne opérationnelle"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gérer le forfait mobile"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait mobile"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Application SMS par défaut"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application SMS ?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%s</xliff:g> comme application SMS ?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Opérateur SIM inconnu"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Aucun site Web de configuration connu pour %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de batterie"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Capteurs appareil uniquement"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune demande d\'accès à votre position n\'a récemment été envoyée pour une application."</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> j <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Données statistiques"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Données statistiques"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Trier par :"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Votre document peut passer par un ou plusieurs serveurs avant d\'être envoyé sur l\'imprimante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter un service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ajouter une imprimante"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Rechercher"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Recherche d\'imprimantes en cours"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tâches d\'impression"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Tâches d\'impression actives"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques relatives aux processus"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées relatives aux processus en cours d\'exécution"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilisation de la mémoire"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Applications de type \"<xliff:g id="TYPE">%1$s</xliff:g>\" sur <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Arrière-plan"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Premier plan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"En cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Utilisation actuelle de la mémoire de l\'appareil : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Taux d\'utilisation moyen de la RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Afficher les processus système"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Utiliser l\'USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arrière-plan"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Premier plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"En cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Saisie et sortie vocales"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Paramètres 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurer et gérer le réseau et le modem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Saisir le mot de passe pour déchiffrer la mémoire de stockage"</string>
     <string name="try_again" msgid="4272075051293936921">"Réessayer"</string>
@@ -2030,7 +2005,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Limitations accès applis et contenu"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Définir des restrictions d\'applis"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 627c4ad..4bc5211 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ करें"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"खाता:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"प्रॉक्सी सेटिंग"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"प्रॉक्सी"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"साफ़ करें"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"प्रॉक्सी पोर्ट"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"इसके लिए प्रॉक्‍सी का उपयोग न करें"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"चालू"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"बंद"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"अक्षम"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"प्रमाणन"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"सत्र जानकारी"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"सुनें मोड सक्षम करें"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"ऑटोनॉमस ग्रुप ऑनर सक्षम करें"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"पॉज़ करें"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"फिर से शुरू करें"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS कॉन्‍फ़िगरेशन"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"सुनें चैनल"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"ऑपरेटिंग चैनल"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को अनटेदर किया जाएगा."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"मोबाइल नेटवर्क"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"मोबाइल प्लान प्रबंधित करें"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाइल प्लान"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"डिफ़ॉल्ट SMS एप्लिकेशन"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS एप्लिकेशन बदलें?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"आपके SMS एप्लिकेशन के रूप <xliff:g id="CURRENT_APP">%s</xliff:g> के बजाय <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"अज्ञात SIM ऑपरेट"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s की कोई भी ज्ञात प्रावधान वेबसाइट नहीं है"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया SIM कार्ड डालें और पुन: प्रारंभ करें"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"केवल उपकरण के सेंसर"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी एप्स ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>घं <xliff:g id="MINUTES">%2$d</xliff:g>मि <xliff:g id="SECONDS">%3$d</xliff:g>से"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>मि <xliff:g id="SECONDS">%2$d</xliff:g>से"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>से"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> दि <xliff:g id="HOURS">%2$d</xliff:g> घं <xliff:g id="MINUTES">%3$d</xliff:g> मि"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> घं <xliff:g id="MINUTES">%2$d</xliff:g> मि"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> मि"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"उपयोग के आंकड़े"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"उपयोग के आंकड़े"</string>
     <string name="display_order_text" msgid="8592776965827565271">"इसके अनुसार क्रमित करें:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"प्रिंट सेवाएं"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"प्रिंटर पर जाते समय आपका दस्तावेज़ एक या अधिक सर्वर से गुज़र सकता है."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"प्रिंटर जोड़ें"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"सेवा जोड़ें"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"प्रिंटर जोड़ें"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"खोजें"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर खोज रहा है"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"प्रिंट कार्य"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"सक्रिय प्रिंट कार्य"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"बैटरी का उपयोग कौन कर रहा है"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रोसेस के आंकड़े"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चल रही प्रोसेस के बारे में गहन आकंड़े"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"स्मृति उपयोग"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> में <xliff:g id="TYPE">%1$s</xliff:g> एप्लिकेशन"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"पृष्ठभूमि"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"अग्रभूमि"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"संचित"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"उपकरण स्मृति वर्तमान में <xliff:g id="MEMSTATE">%1$s</xliff:g> है"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"औसत RAM उपयोग"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"अधिकतम RAM उपयोग"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"सिस्टम दिखाएं"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uss का उपयोग करें"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"आंकड़ों का प्रकार"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"पृष्ठभूमि"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"अग्रभूमि"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"संचित"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ध्‍वनि इनपुट और आउटपुट"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ध्‍वनि इनपुट और आउटपुट सेटिंग"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G सेटिंग"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G नेटवर्क और मॉडेम को सेट करें और प्रबंधित करें"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पता"</string>
     <string name="enter_password" msgid="4131758584074246224">"संग्रहण डीक्रिप्‍ट करने के लिए पासवर्ड लिखें"</string>
     <string name="try_again" msgid="4272075051293936921">"पुन: प्रयास करें."</string>
@@ -1961,7 +1936,7 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्क को मॉनीटर किया जा सकता है"</string>
     <string name="done_button" msgid="1991471253042622230">"पूर्ण"</string>
-    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"नेटवर्क को मॉनीटर करना"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"नेटवर्क मॉनिटरिंग"</string>
     <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"यह उपकरण <xliff:g id="MANAGING_DOMAIN">%s</xliff:g> के द्वारा प्रबंधित किया जाता है.\n\nआपका व्यवस्थापक आपकी नेटवर्क गतिविधि के साथ ही ईमेल, एप्लिकेशन और सुरक्षित वेबसाइटों को मॉनीटर कर सकता है.\n\nअधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें."</string>
     <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"तृतीय पक्ष आपकी नेटवर्क\nगतिविधि के साथ ही ईमेल, एप्लिकेशन, और सुरक्षित वेबसाइटों को मॉनीटर कर सकता है.\n\nऐसा आपके उपकरण पर इंस्टॉल किए गए विश्वसनीय क्रेडेंशियल के कारण हो रहा है."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"विश्वसनीय क्रेडेंशियल की जांच करें"</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"सेल प्रसारण"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"दिखाई देने के लिए आपातकालीन अलर्ट के प्रकारों को चुनें."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"एप्स और सामग्री प्रतिबंध"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"एप्स प्रतिबंधों को सेट करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d8a7062..c50b1f9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Pokreni <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Račun:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy postavke"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Očisti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Priključak proxy poslužitelja"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobiđi proxy za"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Uključeno"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Isključeno"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogućeno"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certifikacija"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informacije o sesiji"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Omogući način slušanja"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Omogući autonomni GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pauziraj"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Nastavi"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfiguracija WPS-a"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanal slušanja"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operativni kanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tabletno računalo dodiruje drugi uređaj"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Upravljanje mobilnim paketom"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilni paket"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Zadana aplikacija za SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Želite li promijeniti aplikaciju za SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Želite li upotrijebiti <xliff:g id="NEW_APP">%s</xliff:g> umjesto <xliff:g id="CURRENT_APP">%s</xliff:g> kao svoju aplikaciju za SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nepoznati SIM operater"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nema poznatu web-lokaciju za niz usluga"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Umetnite SIM karticu i pokrenite ponovo"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Štednja baterije"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo senzori uređaja"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokacija je isključena"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za lokaciju"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije nedavno zatražila lokaciju"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Korisnička statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Korisnička statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Poredati prema:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Ispis"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Usluge ispisa"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Na putu do pisača vaš dokument može proći kroz jedan ili više poslužitelja."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Postavke"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodavanje pisača"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj uslugu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj pisač"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Pretraži"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Traženje pisača"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Zadaci ispisa"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktivni zadaci ispisa"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Što troši bateriju"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podaci o iskorištenosti baterije nisu dostupni."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistički podaci o procesima"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Detaljni statistički podaci o trenutačnim procesima"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Upotreba memorije"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplikacije tijekom <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Pozadina"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Prednji plan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Spremljeno u privremenu memoriju"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memorija uređaja trenutačno je <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Prosječna upotreba RAM-a"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalna upotreba RAM-a"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Vrijeme izvođenja"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usluge"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sustav"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Upotrijebi USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističkih podataka"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadina"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Prednji plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Spremljeno u privremenu memoriju"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Glas. ulaz i izlaz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke za glasovni unos i izlazne vrijednosti"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nije moguća ručna sinkronizacija"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili tu postavku, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Postavke za 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Postavljanje i upravljanje 4G mrežom i modemom"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="4131758584074246224">"Unesite zaporku za dešifriranje pohrane"</string>
     <string name="try_again" msgid="4272075051293936921">"Pokušajte ponovo."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Ograničenja aplikacija i sadržaja"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Postavljanje ograničenja aplikacije"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fcb0773..c73a37c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> indítása"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Fiók:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxybeállítások"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Törlés"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy portja:"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Megkerülési proxy ehhez:"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Be"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ki"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Letiltva"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Tanúsítvány"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Munkamenet-információk"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Figyelő mód engedélyezése"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Autonóm csoporttulajdonos engedélyezése"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Szünet"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Folytatás"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-beállítás"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Csatornafigyelés"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Szolgáltatási csatorna"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tegye lehetővé az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobil-előfizetés kezelése"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil-előfizetés"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Alapértelmezett SMS-alkalmazás"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Módosítja az SMS-alkalmazást?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"A(z) <xliff:g id="NEW_APP">%s</xliff:g> alkalmazást szeretné használni a(z) <xliff:g id="CURRENT_APP">%s</xliff:g> helyett az SMS-ekhez?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ismeretlen SIM kártya szolgáltató"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s – nincs ismert hozzáférés-kezelő webhely"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Helyezze be a SIM kártyát és indítsa újra"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mód"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nagyon pontos"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiatakarékos"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Csak az eszköz érzékelői"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Hely kikapcsolva"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Legutóbbi helylekérdezések"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat."</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ó <xliff:g id="MINUTES">%2$d</xliff:g> p <xliff:g id="SECONDS">%3$d</xliff:g> mp"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> p <xliff:g id="SECONDS">%2$d</xliff:g> mp"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> mp"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> nap <xliff:g id="HOURS">%2$d</xliff:g> óra <xliff:g id="MINUTES">%3$d</xliff:g> perc"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> óra <xliff:g id="MINUTES">%2$d</xliff:g> perc"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> perc"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Használati statisztikák"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Használati statisztika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rendezési szempont:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Nyomdai szolgáltatások"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"A dokumentum áthaladhat egy vagy több szerveren, mielőtt a nyomtatóhoz érne."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Beállítások"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Nyomtatók hozzáadása"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Szolgáltatás hozzáadása"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Nyomtató hozzáadása"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Keresés"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Nyomtatók keresése"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Nyomtatási feladatok"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktív nyomtatási feladatok"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mi használta az akkumulátort"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Nincs akkuhasználati adat"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memóriahasználat"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> alkalmazások a következő időszakra: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Háttérben futó folyamatok"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Előtérben futó folyamatok"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Gyorsítótárazott folyamatok"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Az eszköz memóriája jelenleg <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Átlagos RAM-használat"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximális RAM-használat"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Futási idő"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Szolgáltatások"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Rendszerfolyamatok megjelenítése"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Egyedi készletméret használata"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statisztika típusa"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Háttérben futó folyamatok"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Előtérben futó folyamatok"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Gyorsítótárazott folyamatok"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Hang be- és kimenet"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Hang be- és kimenet beállításai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hangalapú keresés"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nem lehet manuálisan szinkronizálni"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Az elem szinkronizálása jelenleg le van tiltva. A beállítás módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G beállítások"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G hálózat és modem beállítása és kezelése"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
     <string name="enter_password" msgid="4131758584074246224">"Írja be a jelszót a tároló kódolásának feloldásához"</string>
     <string name="try_again" msgid="4272075051293936921">"Próbálja újra."</string>
@@ -2030,7 +2005,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cellán belüli adások"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Válassza ki a megjelenítendő vészriasztások típusait."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Alkalmazás- és tartalomkorlátozások"</string>
     <string name="user_rename" msgid="8523499513614655279">"ÁTNEVEZÉS"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Alkalmazáskorlátozások beállítása"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 62954a4..34b51c7 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Սկսել <xliff:g id="ACTIVITY">activity</xliff:g>-ը"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>`"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Հաշիվ`"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Պրոքսի կարգավորումներ"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Պրոքսի"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Մաքրել"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Պրոքսի միացք"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Շրջանցման պրոքսի"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Միացված"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Անջատել"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Անջատված է"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Վկայագրում"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Աշխատաշրջանի տվյալներ"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Միացնել լսելու ռեժիմը"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Միացնել ինքնավար GO-ն"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Դադարեցնել"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Վերսկսել"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS կարգավորում"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Լսել ուղին"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Աշխատանքային ուղին"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Թույլատրել տվյալների փոխանակումը, երբ գրասալիկը հպում է այլ սարքի"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Թույլատրել տվյալների փոխանակումը, երբ հեռախոսը հպում է մեկ այլ սարքի"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի:"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Օգնություն"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Շարժական ցանցեր"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Կառավարել բջջայինի սակագնային պլանը"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Բջջային փաթեթ"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Լռելյայն SMS ծրագիր"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Փոխե՞լ SMS ծրագիրը:"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Որպես SMS ծրագիր <xliff:g id="CURRENT_APP">%s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM օպերատորն անհայտ է"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-ը չունի ոչ մի ծանոթ նախակարգման վեբկայք"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Խնդրում ենք տեղադրել SIM քարտ և վերագործարկել"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Ռեժիմ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Բարձր ճշգրտություն"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Մարտկոցի տնտեսում"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Միայն սարքի սենսորները"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Տեղադրությունն անջատված"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Տեղանքի վերջին հարցումները"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Որևէ ծրագիր տեղադրության հարցում չի կատարել վերջերս"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ժ <xliff:g id="MINUTES">%2$d</xliff:g>ր <xliff:g id="SECONDS">%3$d</xliff:g>վ"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ր <xliff:g id="SECONDS">%2$d</xliff:g>վ"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>վրկ"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>օր <xliff:g id="HOURS">%2$d</xliff:g>ժ <xliff:g id="MINUTES">%3$d</xliff:g>ր"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ժ <xliff:g id="MINUTES">%2$d</xliff:g>ր"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>ր"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Օգտագործման վիճակագրություն"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Օգտագործման վիճակագրություն"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Դասակարգել ըստ`"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Տպում"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Տպելու ծառայություններ"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Հնարավոր է՝ փաստաթուղթը  մի քանի սերվերներով անցնի մինչ տպվելը:"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Տեղադրված ծառայաթյուններ չկան"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Կարգավորումներ"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ավելացնել տպիչներ"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ավելացնել ծառայություն"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ավելացնել տպիչ"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Որոնել"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Տպիչների որոնում"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Տպել աշխատանքները"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Տպելու ակտիվ աշխատանքները"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Մարտկոց"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ինչն էր օգագործում մարտկոցի լիցքը"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Մարտկոցի օգտագործման տվյալներ չկան:"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Գործընթացի վիճակագրություն"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ընթացիկ գործընթացների տեխնիկական վիճակագրություն"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Օգտագործվող հիշողություն"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ծրագիր <xliff:g id="TIME">%2$s</xliff:g> ժամանակում"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Հետնաշերտ"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Առջևք"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Պահված"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Սարքի հիշողությունն այժմ <xliff:g id="MEMSTATE">%1$s</xliff:g> է"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-ի միջին օգտագործում"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ի առավելագույն օգտագործում"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Աշխատաժամանակ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Ծառայություններ"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Ցույց տալ համակարգը"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Օգտագործել Uss-ը"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Վիճակագրության տեսակը"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Հետնաշերտ"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Առջևք"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Պահված"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ձայնի ներածում &amp; արտածում"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ձայնի մուտքի &amp; ելքի կարգավորումներ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ձայնային որոնում"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Հնարավոր չէ ձեռքով համաժամեցնել"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Համաժամեցումը այս տարրի համար այժմ անջատված է: Այս կարգավորումը փոխելու համար ժամանակավորապես միացրեք հետնաշերտի տվյալները և ինքնահամաժամեցումը:"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G կարգավորումներ"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Կարգավորել &amp; կառավարել 4G ցանցը և մոդեմը"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC հասցե"</string>
     <string name="enter_password" msgid="4131758584074246224">"Մուտքագրեք գաղտնաբառը՝ պահոցը ապակոդավելու համար"</string>
     <string name="try_again" msgid="4272075051293936921">"Կրկին փորձեք:"</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Հաշիվ բովանդակության համար"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Լուսանկար ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Բջջային հեռարձակումներ"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Ընտրել արտակարգ իրավիճակների զանգերի ցուցադրման տեսակները:"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Ծրագրի և բովանդակության սահմանափակումներ"</string>
     <string name="user_rename" msgid="8523499513614655279">"Վերանվանել"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Սահմանել ծրագրային սահմանափակումներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e5d244b..1959bac 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Terhubung (bukan telepon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Terhubung (kecuali media)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tersambung (tidak ada akses pesan)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Terhubung (bukan telepon atau media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Sambungan terputus"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutus sambungan..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Permintaan akses buku telepon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ingin mengakses kontak dan riwayat panggilan Anda. Berikan akses ke %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Permintaan akses pesan"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulai <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Akun:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Setelan proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Bersihkan"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Abaikan proxy untuk"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Pesan"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio media."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas sambungannya dari perangkat masukan."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Tersambung ke peta"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setelan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Nyala"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Mati"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dinonaktifkan"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifikasi"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Info sesi"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktifkan mode mendengarkan"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktifkan GO otonom"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Jeda"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Lanjutkan"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfigurasi WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Dengarkan saluran"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Saluran yang beroperasi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Siapkan hotspot Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Kelola paket data seluler"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket seluler"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplikasi SMS default"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ubah aplikasi SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g>, bukan <xliff:g id="CURRENT_APP">%s</xliff:g>, sebagai aplikasi SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator SIM tidak dikenal"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tak punya situs web penyediaan yang dikenal"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Masukkan kartu SIM dan mulai ulang"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Khusus sensor perangkat"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi mati"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>jam<xliff:g id="MINUTES">%2$d</xliff:g>men <xliff:g id="SECONDS">%3$d</xliff:g>det"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>menit <xliff:g id="SECONDS">%2$d</xliff:g> detik"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>det"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortir menurut:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Layanan cetak"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumen Anda dapat melewati satu atau beberapa server saat menuju printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Setelan"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambahkan printer"</string>
@@ -1460,19 +1444,16 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tambahkan layanan"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tambahkan printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Telusuri"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Menelusuri printer"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tugas pencetakan"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Tugas pencetakan aktif"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Penggunaan baterai sejak penyetelan ulang"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> pada baterai"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"Memakai baterai: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sejak dicabut"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Membebankan"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Layar hidup"</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik teknis tentang proses yang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikasi <xliff:g id="TYPE">%1$s</xliff:g> sampai <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Latar Belakang"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Latar Depan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Dalam Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori perangkat saat ini <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Rata-rata penggunaan RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Waktu berjalan"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Layanan"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Tampilkan sistem"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Latar Depan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Dalam Cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Masukan suara &amp; keluaran"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; setelan keluaran"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Penelusuran suara"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Tidak dapat menyinkronkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Setelan 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Memulai &amp; mengelola jaringan 4G dan modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ketik sandi untuk mendekripsi penyimpanan"</string>
     <string name="try_again" msgid="4272075051293936921">"Coba lagi."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Nonaktif"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Jaringan mungkin dipantau"</string>
+    <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Pemantauan jaringan"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Perangkat ini dikelola oleh: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nAdministrator Anda dapat memantau aktivitas jaringan Anda, termasuk email, aplikasi, dan situs web aman.\n\nUntuk informasi selengkapnya, hubungi administrator."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Pihak ketiga dapat memantau aktivitas\njaringan Anda, termasuk email, aplikasi, dan situs web aman.\n\nKredensial tepercaya yang terpasang di perangkat Anda membuatnya dapat dilakukan."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Periksa kredensial tepercaya"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambahkan pengguna atau profil"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Izinkan aplikasi dan konten"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan batasan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Luaskan setelan untuk aplikasi"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Copot pemasangan aplikasi ini"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis peringatan darurat yang akan ditampilkan."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Pembatasan aplikasi dan konten"</string>
     <string name="user_rename" msgid="8523499513614655279">"GANTI NAMA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Setel batasan aplikasi"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 894e429..dc1f462 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Inizia <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Impostazioni proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Cancella"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignora proxy per"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Attiva"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Non attiva"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disattivata"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificazione"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informazioni sulla sessione"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Attiva modalità di ascolto"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Attiva GO autonomi"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Metti in pausa"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Riprendi"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configurazione WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canale di ascolto"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canale operativo"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestione piano dati mobile"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Piano dati mobile"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"App SMS predefinita"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiare app per SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> anziché <xliff:g id="CURRENT_APP">%s</xliff:g> come applicazione per SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operatore SIM sconosciuto"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Nessun sito web di provisioning per %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modalità"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Risparmio della batteria"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensori dispositivo"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Geolocalizzazione non attiva"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Richieste di posizione recenti"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nessuna applicazione ha richiesto la posizione di recente"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> g <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistiche di utilizzo"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistiche di utilizzo"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordina per:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Stampa"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizi di stampa"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Il tuo documento potrebbe attraversare uno o più server per raggiungere la stampante."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Aggiungi servizio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Aggiungi stampante"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Cerca"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Ricerca di stampanti"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Processi di stampa"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Processi di stampa attivi"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dati uso batteria non disp."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiche sui processi"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistiche tecniche sui processi in esecuzione"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memoria usata"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"App <xliff:g id="TYPE">%1$s</xliff:g> per <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"In background"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"In primo piano"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Memorizzati nella cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Attuale memoria del dispositivo: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilizzo medio della RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizzo massimo della RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Run-time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servizi"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostra sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Utilizza Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo di statistiche"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"In background"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"In primo piano"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Memorizzati nella cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Impostazioni vocali"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni input e output vocale"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ricerca vocale"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Impossibile sincronizzare manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Al momento la sincronizzazione di questo elemento non è attiva. Per modificare questa impostazione, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Impostazioni 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Imposta e gestisci rete e modem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digita la password per decrittografare l\'archivio"</string>
     <string name="try_again" msgid="4272075051293936921">"Riprova."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcast"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Seleziona i tipi di avvisi di emergenza da visualizzare."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Limitazioni per app e contenuti"</string>
     <string name="user_rename" msgid="8523499513614655279">"RINOMINA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Imposta restrizioni applicazioni"</string>
diff --git a/res/values-iw-nokeys/strings.xml b/res/values-iw-nokeys/strings.xml
index f13c3b3..95f790d 100644
--- a/res/values-iw-nokeys/strings.xml
+++ b/res/values-iw-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <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" msgid="6616938758022986257">"נהל יישומים"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"נהל אפליקציות"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 1ba8d47..c370702 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -169,7 +169,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"זמן שימוש"</item>
     <item msgid="3703676222230317933">"הפעל ספירה"</item>
-    <item msgid="2502754479975776899">"שם היישום"</item>
+    <item msgid="2502754479975776899">"שם האפליקציה"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1e6da54..b8b7029 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -149,15 +149,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="8398232791303186677">"‏בוחר מכשיר Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"‏בקשה להרשאת Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"‏יישום מסוים רוצה להפעיל את ה-Bluetooth."</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"‏יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"‏יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"‏יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"‏יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"‏יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"‏יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"‏יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"‏יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"‏אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"‏אפליקציה מסוימת רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"‏אפליקציה מסוימת רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"‏אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"‏מפעיל Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"‏Bluetooth נכבה…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"חיבור אוטומטי"</string>
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"הפעל את <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"חשבון:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"‏הגדרות של שרת proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"‏שרת Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"‏יציאת שרת Proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"‏עקוף שרת Proxy עבור"</string>
@@ -198,7 +198,7 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"עליך למלא את שדה היציאה."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"היציאה שהקלדת אינה חוקית."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"‏שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך אפליקציות אחרות לא יכולים להשתמש בו."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"‏CID שכן:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
@@ -325,11 +325,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנה"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן טאבלט"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"‏דורש PIN מספרי או סיסמה לפענוח הטבלט בכל הפעלה"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"‏דורש PIN מספרי או סיסמה לפענוח הטאבלט בכל הפעלה"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"‏דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"‏אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"‏אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"‏אתה יכול להצפין חשבונות, הגדרות, אפליקציות שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטאבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטאבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטאבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"‏אתה יכול להצפין חשבונות, הגדרות, אפליקציות שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טאבלט"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
@@ -337,15 +337,15 @@
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"‏אין PIN או סיסמה לנעילת מסך"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"‏עליך להגדיר PIN או סיסמה לנעילת מסך כדי שתוכל להתחיל בהצפנה."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"האם להצפין?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטבלט יופעל מחדש כמה פעמים."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטאבלט יופעל מחדש כמה פעמים."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"פעולת ההצפנה אינה ניתנת לביטול, ואם תפסיק אותה תאבד נתונים. ההצפנה אורכת שעה לפחות, ובמהלך זמן זה הטלפון יופעל מחדש כמה פעמים."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"מצפין"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"המתן בזמן הצפנת הטבלט. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"המתן בזמן הצפנת הטאבלט. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"המתן בזמן הצפנת הטלפון. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"‏ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. \n\nכדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"‏ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטאבלט שלך. \n\nכדי לחזור ולהשתמש בטאבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטאבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"‏ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. \n\nכדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"החלפת שיטת קלט"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
@@ -427,14 +427,14 @@
     <string name="manage_device_admin" msgid="5059296715271077278">"מנהלי התקנים"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"הצג או השבת מנהלי התקנים"</string>
     <string name="manage_notification_access" msgid="5799781079264981979">"גישה אל התראות"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"יישומים לא יכולים לקרוא התראות"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
   <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏יישום %d יכול לקרוא התראות"</item>
-    <item quantity="other" msgid="980049191810249052">"‏%d יישומים יכולים לקרוא התראות"</item>
+    <item quantity="one" msgid="8344183614159211585">"‏אפליקציה %d יכולה לקרוא התראות"</item>
+    <item quantity="other" msgid="980049191810249052">"‏%d אפליקציות יכולות לקרוא התראות"</item>
   </plurals>
     <string name="no_notification_listeners" msgid="2767405417723149879">"לא מותקנים מאזינים להתראות."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההתראות שפורסמו על ידי המערכת או על ידי יישום מותקן כלשהו, והדבר עשוי לכלול מידע אישי כמו שמות אנשי קשר ואת הטקסט בהודעות שנשלחו אליך. הוא יוכל גם לסגור את ההתראות האלה או להשתמש בלחצני פעולה בתוכן."</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההתראות שפורסמו על ידי המערכת או על ידי אפליקציה מותקנת כלשהי, והדבר עשוי לכלול מידע אישי כמו שמות אנשי קשר ואת הטקסט בהודעות שנשלחו אליך. הוא יוכל גם לסגור את ההתראות האלה או להשתמש בלחצני פעולה בתוכן."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"‏הפעל את Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -534,26 +534,17 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"מופעל"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"כבוי"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"מושבת"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"אישור"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"מידע על פעילות באתר"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"הפעל מצב האזנה"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"‏הפעל GO אוטונומי"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"השהה"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"המשך"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"‏תצורת WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"ערוץ האזנה"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"ערוץ הפעלה"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"אפשר החלפת נתונים כאשר הטלפון נוגע במכשיר אחר"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"‏מוכן לשדר תוכן יישום באמצעות NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"‏מוכן לשדר תוכן אפליקציה באמצעות NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"כבוי"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"‏לא זמין משום שה-NFC כבוי"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"‏כאשר תכונה זו מופעלת, תוכל לשדר תוכן יישומים למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרובים אחד לשני. לדוגמה, תוכל לשדר דפי דפדפן, סרטוני YouTube, אנשי קשר  ועוד.\n\nפשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך שלך. היישום יקבע מה ישודר."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"‏כאשר תכונה זו מופעלת, תוכל לשדר תוכן אפליקציות למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרובים אחד לשני. לדוגמה, תוכל לשדר דפי דפדפן, סרטוני YouTube, אנשי קשר  ועוד.\n\nפשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך שלך. האפליקציה תקבע מה ישודר."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"גילוי שירותי רשת"</string>
-    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"אפשר ליישומים במכשירים אחרים לגלות יישומים במכשיר זה"</string>
+    <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"אפשר לאפליקציות במכשירים אחרים לגלות אפליקציות במכשיר זה"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‏הפעל את ה-Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -571,10 +562,10 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"‏אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"סריקה זמינה תמיד"</string>
-    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"‏תן לשירות המיקום של Google וליישומים אחרים לסרוק על מנת למצוא רשתות, גם כש-Wi-Fi כבוי."</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"‏תן לשירות המיקום של Google ולאפליקציות אחרות לסרוק על מנת למצוא רשתות, גם כש-Wi-Fi כבוי."</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקן אישורים"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, יישומים של Google ויישומים נוספים עשויים לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏יישומים עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"‏כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, אפליקציות של Google ואפליקציות נוספות עשויות לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"‏אפליקציות עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"אל תציג שוב"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"‏השאר את ה-Wi-Fi פועל בזמן שינה"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
@@ -639,7 +630,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל היישומים שרוצים לסרוק?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"דחה"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
@@ -736,25 +727,25 @@
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"אודיו"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"הגדרות עבור עגינת שולחן העבודה המצורפת"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"הגדרות עבור עגינת הרכב המצורפת"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"הטבלט אינו בעגינה"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"הטאבלט אינו בעגינה"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"הטלפון לא בעגינה"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"הגדרות עבור העגינה המצורפת"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"לא נמצאה עגינה"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"עליך לעגן את הטבלט לפני הגדרת אודיו ממעגן."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"עליך לעגן את הטאבלט לפני הגדרת אודיו ממעגן."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"עליך לעגן את הטלפון לפני הגדרת אודיו ממעגן."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"צליל כניסה למעגן"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"השמע צלילים בעת הכנסה של הטבלט לעגינה או הוצאתו ממנה"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"השמע צלילים בעת הכנסה של הטאבלט לעגינה או הוצאתו ממנה"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"הפעל צליל בעת כניסת הטלפון לעגינה או יציאתו מעגינה"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"אל תשמיע צלילים בעת הכנסת הטבלט לעגינה או הסרתו משם"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"אל תשמיע צלילים בעת הכנסת הטאבלט לעגינה או הסרתו משם"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"אל תפעיל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מעגינה"</string>
     <string name="account_settings" msgid="6403589284618783461">"חשבונות"</string>
     <string name="search_settings" msgid="1910951467596035063">"חיפוש"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"ניהול הגדרות והיסטוריה של חיפוש"</string>
     <string name="display_settings" msgid="7965901687241669598">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"סיבוב אוטומטי של המסך"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"שנה כיוון באופן אוטומטי בעת סיבוב הטבלט"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"שנה כיוון באופן אוטומטי בעת סיבוב הטלפון"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"שנה כיוון באופן אוטומטי בעת סיבוב הטבלט"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"שנה כיוון באופן אוטומטי בעת סיבוב הטלפון"</string>
     <string name="brightness" msgid="2354961343555249270">"בהירות"</string>
     <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
@@ -779,9 +770,9 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"‏הגדר נעילה של כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏נעילת כרטיס SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"‏נעל כרטיס SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"‏דרוש PIN כדי להשתמש בטבלט"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"‏דרוש PIN כדי להשתמש בטאבלט"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"‏דרוש PIN כדי להשתמש בטלפון"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"‏דרוש PIN כדי להשתמש בטבלט"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"‏דרוש PIN כדי להשתמש בטאבלט"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"‏דרוש PIN כדי להשתמש בטלפון"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"‏שנה PIN של SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"‏PIN של SIM"</string>
@@ -867,12 +858,12 @@
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"‏מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה ותמונות."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"‏מוחק את כל הנתונים שבכרטיס SD, כגון מוסיקה ותמונות."</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"האם לנקות נתונים בקובץ שמור?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"פעולה זו תנקה נתונים בקובץ שמור, לכל היישומים."</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"פעולה זו תנקה נתונים בקובץ שמור, לכל האפליקציות."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"‏פונקציית MTP או PTP פעילה"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"‏לבטל את טעינת אחסון ה-USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"‏לבטל את הטעינה של כרטיס ה-SD?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"‏אם תבטל את טעינת אחסון ה-USB, יישומים מסוימים שבהם אתה משתמש יופסקו וייתכן שלא יהיו זמינים עד שתטען מחדש את אחסון ה-USB."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"‏אם תבטל את טעינת כרטיס ה-SD, הפעולה של יישומים מסוימים שאתה משתמש בהם תופסק וייתכן שהם לא יהיו זמינים עד שתטען מחדש את כרטיס ה-SD."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"‏אם תבטל את טעינת אחסון ה-USB, אפליקציות מסוימות שבהן אתה משתמש יופסקו וייתכן שלא יהיו זמינות עד שתטען מחדש את אחסון ה-USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"‏אם תבטל את טעינת כרטיס ה-SD, הפעולה של אפליקציות מסוימות שאתה משתמש בהן תופסק וייתכן שהן לא יהיו זמינות עד שתטען מחדש את כרטיס ה-SD."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"‏לא ניתן לבטל את הטעינה של אחסון ה-USB. נסה שוב מאוחר יותר."</string>
@@ -882,7 +873,7 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"מבטל טעינה"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"שטח האחסון הולך ואוזל"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"ייתכן שפונקציות מסוימות של המערכת, כמו סנכרון, לא יפעלו כראוי. נסה לפנות מקום על ידי מחיקה או ביטול הצמדה של פריטים, כגון יישומים או תוכן מדיה."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"ייתכן שפונקציות מסוימות של המערכת, כמו סנכרון, לא יפעלו כראוי. נסה לפנות מקום על ידי מחיקה או ביטול הצמדה של פריטים, כגון אפליקציות או תוכן מדיה."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"‏חיבור USB למחשב"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏חיבור USB למחשב"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
@@ -936,10 +927,10 @@
     <string name="menu_restore" msgid="8260067415075573273">"אפס לברירת המחדל"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"‏איפוס הגדרות ברירת המחדל של APN הושלם."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטבלט"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטאבלט"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nכדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
@@ -950,7 +941,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוסיקה או תמונות"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והיישומים שהורדת? לא ניתן לבטל את הפעולה!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"מחק הכל"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"שרטט את קו ביטול הנעילה"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"עליך לשרטט את קו ביטול הנעילה כדי לאפשר איפוס נתוני יצרן."</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"רשתות לנייד"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"נהל תוכנית לנייד"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"תוכנית לנייד"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"‏אפליקציית SMS המוגדרת כברירת מחדל"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏לשנות את אפליקציית ה-SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"‏האם להשתמש ב-<xliff:g id="NEW_APP">%s</xliff:g> במקום ב-<xliff:g id="CURRENT_APP">%s</xliff:g> כאפליקציית ה-SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"‏ספק SIM לא מוכר"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏ל-%1$s אין אתר מוכר לניהול תצורה"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏הכנס כרטיס SIM ואתחל"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"מצב"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"רמת דיוק גבוהה"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"חיסכון בעוצמת סוללה"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"חיישני המכשיר בלבד"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"מיקום כבוי"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"בקשות של מיקומים אחרונים"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"אין אפליקציות שביקשו מיקום לאחרונה"</string>
@@ -1020,20 +1015,20 @@
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"‏השתמש ב-GPS למיקום מדויק"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"מאחזר…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"‏מיקום רשת Wi-Fi ורשת לנייד"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר ליישומים להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"‏לווייני GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"‏אפשר ליישומים להשתמש ב-GPS בטאבלט שלך כדי לאתר את מיקומך"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"‏אפשר ליישומים להשתמש ב-GPS בטלפון שלך כדי לאתר את מיקומך"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"‏אפשר לאפליקציות להשתמש ב-GPS בטאבלט שלך כדי לאתר את מיקומך"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"‏אפשר לאפליקציות להשתמש ב-GPS בטלפון שלך כדי לאתר את מיקומך"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"‏השתמש ב-Assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"‏השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לצמצם את השימוש ברשת)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"‏השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לשפר את ביצועי GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"‏מיקום וחיפוש Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"‏אפשר ל-Google להשתמש במיקום שלך כדי לשפר את תוצאות החיפוש ושירותים נוספים"</string>
     <string name="location_access_title" msgid="7064108942964081243">"גישה למיקום שלי"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"אפשר ליישומים שביקשו את אישורך להשתמש בפרטי המיקום שלך"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"אפשר לאפליקציות שביקשו את אישורך להשתמש בפרטי המיקום שלך"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"מקורות מיקום"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטבלט"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטאבלט"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"מידע על הטלפון"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"הצג מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
@@ -1088,21 +1083,21 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"כיצד לשרטט קו ביטול נעילה"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"ניסיונות כושלים רבים מדי!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"נסה שוב בעוד <xliff:g id="NUMBER">%d</xliff:g> שניות."</string>
-    <string name="activity_not_found" msgid="5551664692991605325">"היישום אינו מותקן בטלפון."</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל יישומים"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר יישומים מותקנים"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"האפליקציה אינה מותקנת בטלפון."</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל אפליקציות"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר אפליקציות מותקנות"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול יישומים, הגדרת קיצורי דרך להפעלה מהירה"</string>
-    <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות יישום"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
+    <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
-    <string name="install_unknown_applications" msgid="176855644862942064">"אפשר התקנת יישומים ממקורות לא ידועים"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"הטבלט והנתונים האישיים שלך חשופים יותר בפני התקפות על ידי יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שייגרם לטבלט שלך או לאובדן נתונים שעלולים להיגרם בעקבות שימוש ביישומים אלה."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"הטלפון והנתונים האישיים שלך חשופים יותר בפני התקפות של יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שנגרם לטלפון או לאובדן של נתונים שעשויים להיגרם כתוצאה משימוש ביישומים אלה."</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"אפשר התקנת אפליקציות ממקורות לא ידועים"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"הטאבלט והנתונים האישיים שלך חשופים יותר בפני התקפות על ידי אפליקציות ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שייגרם לטאבלט שלך או לאובדן נתונים שעלולים להיגרם בעקבות שימוש באפליקציות אלה."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"הטלפון והנתונים האישיים שלך חשופים יותר בפני התקפות של אפליקציות ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שנגרם לטלפון או לאובדן של נתונים שעשויים להיגרם כתוצאה משימוש באפליקציות אלה."</string>
     <string name="verify_applications" msgid="2959359554974828518">"אמת אפליקציות"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"מנע או הזהר לפני התקנת אפליקציה שעשויה לגרום נזק"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
-    <string name="application_info_label" msgid="5736524913065714880">"פרטי יישום"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציה"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"הפעל כברירת מחדל"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ברירות מחדל"</string>
@@ -1114,8 +1109,8 @@
     <string name="controls_label" msgid="7611113077086853799">"פקדים"</string>
     <string name="force_stop" msgid="7435006169872876756">"אלץ עצירה"</string>
     <string name="total_size_label" msgid="1048676419552557254">"סה\"כ"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"יישום"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"‏יישום של אחסון USB"</string>
+    <string name="application_size_label" msgid="8494609207373874267">"אפליקציה"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"‏אפליקציה של אחסון USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"נתונים"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"‏נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"‏כרטיס SD"</string>
@@ -1126,22 +1121,22 @@
     <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"הסר התקנה של עדכונים"</string>
-    <string name="auto_launch_enable_text" msgid="2652825923953591251">"בחרת להפעיל יישום זה כברירת מחדל עבור פעולות מסוימות."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"‏בחרת לאפשר ליישום זה ליצור Widgets ולגשת לנתונים שלהם."</string>
+    <string name="auto_launch_enable_text" msgid="2652825923953591251">"בחרת להפעיל אפליקציה זו כברירת מחדל עבור פעולות מסוימות."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"בחרת לאפשר לאפליקציה ליצור ווידג\'טים ולגשת לנתונים שלהם."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"לא הוגדרו ברירות מחדל."</string>
     <string name="clear_activities" msgid="7408923511535174430">"נקה ברירות מחדל"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"ייתכן שיישום זה אינו מיועד למסך שלך. תוכל לשלוט באופן שבו הוא מותאם למסך שלך כאן."</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"ייתכן שאפליקציה זו אינה מיועדת למסך שלך. תוכל לשלוט באופן שבה היא מותאמת למסך שלך כאן."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"שאל בעת הפעלה"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"שנה קנה מידה של יישום"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"שנה קנה מידה של אפליקציה"</string>
     <string name="unknown" msgid="1592123443519355854">"לא ידוע"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"מיין לפי שם"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
     <string name="show_running_services" msgid="5736278767975544570">"הצג שירותים פועלים"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות יישום"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות יישום?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות אפליקציה"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות אפליקציה?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"הפעולה תאפס את כל ההעדפות עבור:\n\n "<li>"אפליקציות מושבתות"</li>\n" "<li>"הודעות של אפליקציות מושבתות"</li>\n" "<li>"אפליקציות בברירת מחדל לביצוע פעולות"</li>\n" "<li>"הגבלות של נתוני רקע עבור אפליקציות"</li>\n<li></li>" \nהגבלות הרשאה כלשהן\n לא תאבד נתוני אפליקציות."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס יישומים"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס אפליקציות"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
@@ -1153,70 +1148,70 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
     <string name="not_installed" msgid="1475144352069281880">"לא מותקן"</string>
-    <string name="no_applications" msgid="7336588977497084921">"אין יישומים."</string>
+    <string name="no_applications" msgid="7336588977497084921">"אין אפליקציות."</string>
     <string name="internal_storage" msgid="1584700623164275282">"אחסון פנימי"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"‏אחסון USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"‏אחסון בכרטיס SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"מחשב מחדש את הגודל…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"למחוק את נתוני היישומים?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"כל נתוני היישום יימחקו לצמיתות. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"למחוק את נתוני האפליקציות?"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"כל נתוני האפליקציה יימחקו לצמיתות. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"אישור"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ביטול"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
-    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"היישום לא נמצא ברשימת היישומים המותקנים."</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"לא ניתן למחוק את נתוני היישום."</string>
+    <string name="app_not_found_dlg_text" msgid="8333723538280257243">"האפליקציה לא נמצאת ברשימת האפליקציות המותקנות."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"לא ניתן למחוק את נתוני האפליקציה."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"להסיר את התקנת העדכונים?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"‏כל העדכונים ליישום מערכת Android זו יוסרו."</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"‏כל העדכונים לאפליקציית מערכת Android זו יוסרו."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"נקה נתונים"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"לא ניתן למחוק את נתוני היישום."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"יישום זה יכול לגשת לפריטים הבאים בטבלט שלך:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"יישום זה יכול לגשת לפריטים הבאים בטלפון:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"יישום זה יכול לגשת ליכולות הבאות בטאבלט שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"יישום זה יכול לגשת ליכולות הבאות בטלפון שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"לא ניתן למחוק את נתוני האפליקציה."</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"אפליקציה זו יכולה לגשת לפריטים הבאים בטאבלט שלך:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"אפליקציה זו יכולה לגשת לפריטים הבאים בטלפון:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"אפליקציה זו יכולה לגשת ליכולות הבאות בטאבלט שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"אפליקציה זו יכולה לגשת ליכולות הבאות בטלפון שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> וגם <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ו-<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="security_settings_billing_desc" msgid="8061019011821282358">"יישום זה עשוי לחייב אותך בכסף:"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"אפליקציה זו עשויה לחייב אותך בכסף:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"‏האם לשלוח SMS פרימיום?"</string>
     <string name="computing_size" msgid="1599186977475211186">"מחשב..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"לא ניתן לחשב את גודל החבילה."</string>
-    <string name="empty_list_msg" msgid="5993162337235907160">"לא מותקנים במכשיר שלך יישומים של צד שלישי."</string>
+    <string name="empty_list_msg" msgid="5993162337235907160">"לא מותקנים במכשיר שלך אפליקציות של צד שלישי."</string>
     <string name="version_text" msgid="9189073826278676425">"גרסה <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"העבר"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"העבר לטבלט"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"העבר לטאבלט"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"העבר לטלפון"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"‏העבר לאמצעי אחסון מסוג USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"‏העבר לכרטיס SD"</string>
     <string name="moving" msgid="6431016143218876491">"מעביר"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"אין מספיק שטח אחסון."</string>
-    <string name="does_not_exist" msgid="3476487214886606748">"היישום אינו קיים."</string>
-    <string name="app_forward_locked" msgid="6331564656683790866">"היישום מוגן בפני העתקה."</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"האפליקציה לא קיימת."</string>
+    <string name="app_forward_locked" msgid="6331564656683790866">"האפליקציה מוגנת בפני העתקה."</string>
     <string name="invalid_location" msgid="2786030127356312746">"מיקום ההתקנה אינו חוקי."</string>
     <string name="system_package" msgid="6222593098063037137">"לא ניתן להתקין עדכוני מערכת במדיה חיצונית."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"לאלץ עצירה?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"אם אתה מאלץ עצירה של יישום, ייתכן שהוא לא יפעל כהלכה."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"אם אתה מאלץ עצירה של אפליקציה, ייתכן שהיא לא תפעל כהלכה."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
-    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"לא ניתן להעביר את היישום. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"לא ניתן להעביר את האפליקציה. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"מיקום התקנה מועדף"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"שנה את מיקום ההתקנה המועדף עבור יישומים חדשים."</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"להשבית יישום מובנה?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"אם תשבית יישום מובנה, יישומים אחרים עשויים שלא לפעול כהלכה."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"האם למחוק נתונים ולהשבית את היישום?"</string>
-    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"אם תשבית יישום מובנה, ייתכן שיישומים אחרים יתנהגו באופן בעייתי. גם הנתונים שלך יימחקו."</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"שנה את מיקום ההתקנה המועדף עבור אפליקציות חדשות."</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"להשבית אפליקציה מובנית?"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"אם תשבית אפליקציה מובנית, אפליקציות אחרות עשויים שלא לפעול כהלכה."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"האם למחוק נתונים ולהשבית את האפליקציה?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"אם תשבית אפליקציה מובנית, ייתכן שאפליקציות אחרות יתנהגו באופן בעייתי. גם הנתונים שלך יימחקו."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל התראות?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התראות עבור יישום זה, אתה עלול להחמיץ התראות ועדכונים חשובים."</string>
-    <string name="app_ops_settings" msgid="5108481883575527511">"פעולות יישום"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התראות עבור אפליקציה זו, אתה עלול להחמיץ התראות ועדכונים חשובים."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"פעולות אפליקציה"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"פועל"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(מעולם לא נעשה שימוש)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"הצג את שטח האחסון שנמצא בשימוש על ידי יישומים"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"הצג את שטח האחסון שנמצא בשימוש על ידי אפליקציות"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"שירותים פועלים"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"הצג ושלוט בשירותים הפועלים כעת"</string>
     <string name="service_restarting" msgid="2242747937372354306">"מפעיל מחדש"</string>
     <string name="cached" msgid="1059590879740175019">"תהליך רקע בקובץ שמור"</string>
     <string name="no_running_services" msgid="2059536495597645347">"אף שירות אינו פועל."</string>
-    <string name="service_started_by_app" msgid="818675099014723551">"הופעל על ידי יישום."</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"הופעל על ידי אפליקציה."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> של שטח פנוי"</string>
@@ -1230,21 +1225,21 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"תהליך <xliff:g id="NUMPROCESS">%1$d</xliff:g> ו-‏<xliff:g id="NUMSERVICES">%2$d</xliff:g> שירותים"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> תהליכים ושירות <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> תהליכים ו-‏<xliff:g id="NUMSERVICES">%2$d</xliff:g> שירותים"</string>
-    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"יישומים פעיל"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"אפליקציות פעילות"</string>
     <string name="no_services" msgid="7133900764462288263">"לא פעיל"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"שירותים"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"תהליכים"</string>
     <string name="service_stop" msgid="6369807553277527248">"עצור"</string>
     <string name="service_manage" msgid="1876642087421959194">"הגדרות"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"שירות זה הופעל על ידי היישום שלו. הפסקת הפעילות עלולה לגרום לכשל ביישום."</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"לא ניתן להפסיק יישום זה באופן בטוח. אם תפסיק אותו, אתה עלול לאבד חלק מהעבודה הנוכחית שלך."</string>
-    <string name="background_process_stop_description" msgid="5034773197139654588">"זהו תהליך יישום ישן שעדיין פועל למקרה שיהיה נחוץ שוב. בדרך כלל אין סיבה להפסיק אותו."</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"שירות זה הופעל על ידי האפליקציה שלו. הפסקת הפעילות עלולה לגרום לכשל באפליקציה."</string>
+    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"לא ניתן להפסיק אפליקציה זו באופן בטוח. אם תפסיק אותה, אתה עלול לאבד חלק מהעבודה הנוכחית שלך."</string>
+    <string name="background_process_stop_description" msgid="5034773197139654588">"זהו תהליך אפליקציה ישן שעדיין פועל למקרה שיהיה נחוץ שוב. בדרך כלל אין סיבה להפסיק אותו."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: בשימוש כרגע. גע ב\'אפשרויות\' כדי לשלוט בו."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"תהליך ראשי נמצא בשימוש."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"השירות <xliff:g id="COMP_NAME">%1$s</xliff:g> נמצא בשימוש."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"הספק <xliff:g id="COMP_NAME">%1$s</xliff:g> נמצא בשימוש."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"להפסיק שירות מערכת?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"אם תפסיק שירות זה, תכונות מסוימות של הטבלט עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"אם תפסיק שירות זה, תכונות מסוימות של הטאבלט עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"אם תפסיק שירות זה, תכונות מסוימות של הטלפון עלולות להפסיק לפעול כהלכה עד לכיבוי המכשיר והפעלתו מחדש."</string>
     <string name="language_settings" msgid="5292716747264442359">"שפה וקלט"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"שפה וקלט"</string>
@@ -1260,8 +1255,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"הגדרות מקלדת פיזית"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \'.\'"</string>
     <string name="show_password" msgid="3001113966880559611">"הפוך את הסיסמאות לגלויות"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"ייתכן ששיטת קלט זו תוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. היא מגיעה מהיישום <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. האם להשתמש בשיטת קלט זו?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ייתכן שבודק איות זה יוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. הוא מגיע מהיישום <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. להשתמש בבודק איות זה?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"ייתכן ששיטת קלט זו תוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. היא מגיעה מהאפליקציה <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. האם להשתמש בשיטת קלט זו?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ייתכן שבודק איות זה יוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. הוא מגיע מהאפליקציה <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. להשתמש בבודק איות זה?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"הגדרות"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"שפה"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"פתיחת הגדרות עבור <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> נכשלה"</string>
@@ -1299,8 +1294,8 @@
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"מידע על הטלפון"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"מידע על סוללה"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"הפעלה מהירה"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"הגדרת מקשי קיצור להפעלת יישומים"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"הקצאה ליישום"</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"הגדרת מקשי קיצור להפעלת אפליקציות"</string>
+    <string name="quick_launch_assign_application" msgid="6240064079456617501">"הקצאה לאפליקציה"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"אין קיצור דרך"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"חיפוש + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"נקה"</string>
@@ -1327,7 +1322,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"מקלדת פיזית"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"הגדרות מקלדת פיזית"</string>
     <string name="development_settings_title" msgid="215179176067683667">"אפשרויות מפתח"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח יישומים"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח אפליקציות"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"אפשרויות מפתח אינן זמינות עבור משתמש זה"</string>
     <string name="enable_adb" msgid="7982306934419797485">"‏ניקוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"‏מצב תיקון באגים כאשר USB מחובר"</string>
@@ -1346,22 +1341,22 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניקוי באגים של USB?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"‏ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת יישומים במכשיר ללא התראה ולקריאת נתוני יומן."</string>
+    <string name="adb_warning_message" msgid="7316799925425402244">"‏ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏האם לבטל את הגישה לניקוי באגים ב-USB מכל המחשבים שהענקת להם בעבר הרשאה?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"האם להתיר הגדרות פיתוח?"</string>
-    <string name="dev_settings_warning_message" msgid="2298337781139097964">"הגדרות אלה מיועדות לשימוש בפיתוח בלבד. הן עלולות לגרום למכשיר או ליישומים המותקנים בו לקרוס או לפעול באופן לא תקין."</string>
+    <string name="dev_settings_warning_message" msgid="2298337781139097964">"הגדרות אלה מיועדות לשימוש בפיתוח בלבד. הן עלולות לגרום למכשיר או לאפליקציות המותקנות בו לקרוס או לפעול באופן לא תקין."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"‏אמת אפליקציות באמצעות USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"‏בדוק יישומים שהותקנו באמצעות ADB/ADT לאיתור התנהגות מזיקה."</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"‏בדוק אפליקציות שהותקנו באמצעות ADB/ADT לאיתור התנהגות מזיקה."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"‏הגנה על אחסון USB"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"‏על יישומים לבקש רשות כדי לקרוא אחסון USB"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"‏על אפליקציות לבקש רשות כדי לקרוא אחסון USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"‏האם להגן על אחסון USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"‏כאשר אחסון USB מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"‏כאשר אחסון USB מוגן, על אפליקציות לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שאפליקציות מסוימות לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"‏הגנה על כרטיס SD"</string>
-    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"‏על יישומים לבקש רשות כדי לקרוא כרטיס SD"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"‏על אפליקציות לבקש רשות כדי לקרוא כרטיס SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"‏האם להגן על כרטיס ה-SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"‏כאשר כרטיס ה-SD מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"‏כאשר כרטיס ה-SD מוגן, על אפליקציות לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שאפליקציות מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
     <string name="enable_terminal_title" msgid="95572094356054120">"מסוף מקומי"</string>
-    <string name="enable_terminal_summary" msgid="67667852659359206">"הפעל יישום מסוף המציע גישה מקומית למעטפת"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"הפעל אפליקציית מסוף המציעה גישה מקומית למעטפת"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"‏בחר Widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"‏האם ליצור Widget‏ ולאפשר גישה?"</string>
@@ -1371,16 +1366,13 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> שעות <xliff:g id="MINUTES">%2$d</xliff:g> דקות <xliff:g id="SECONDS">%3$d</xliff:g> שניות"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>דקות <xliff:g id="SECONDS">%2$d</xliff:g>שניות"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> שניות"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>ימים <xliff:g id="HOURS">%2$d</xliff:g>שעות <xliff:g id="MINUTES">%3$d</xliff:g>דקות"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>שעות <xliff:g id="MINUTES">%2$d</xliff:g>דקות"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>דקות"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"סטטיסטיקת שימוש"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"סטטיסטיקת שימוש"</string>
     <string name="display_order_text" msgid="8592776965827565271">"מיין לפי:"</string>
-    <string name="app_name_label" msgid="5440362857006046193">"יישום"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"אפליקציה"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"ספירה"</string>
     <string name="usage_time_label" msgid="295954901452833058">"זמן שימוש"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"נגישות"</string>
@@ -1397,7 +1389,7 @@
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"טקסט גדול"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"הגדלת מסך"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"עדכון אוטומטי של הגדלת מסך"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"עדכון הגדלת מסך במעבר בין יישומים"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"עדכון הגדלת מסך במעבר בין אפליקציות"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"אמירת סיסמאות"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"עיכוב של נגיעה והחזקה"</string>
@@ -1432,7 +1424,7 @@
     <string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> צריך:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"הצג את הפעולות שלך"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"קבל התראות כשאתה מבצע אינטראקציה עם יישום."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"קבל התראות כשאתה מבצע אינטראקציה עם אפליקציה."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"נגיעה ב\'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"הדפסה"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"שירותי הדפסה"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ייתכן שהמסמך שלך יעבור בשרת אחד או יותר בדרכו למדפסת."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"הגדרות"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוסף שירות"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"הוסף מדפסת"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"חפש"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"מחפש מדפסות"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"עבודות הדפסה"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"עבודות הדפסה פעילות"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"סוללה"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"מה השתמש בסוללה"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"אין נתונים זמינים על השימוש בסוללה."</string>
@@ -1507,8 +1495,8 @@
     <string name="usage_type_on_time" msgid="3351200096173733159">"משך פעולה עד כה"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"זמן ללא אות"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"אלץ עצירה"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"פרטי יישום"</string>
-    <string name="battery_action_app_settings" msgid="4570481408106287454">"הגדרות יישום"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"פרטי אפליקציה"</string>
+    <string name="battery_action_app_settings" msgid="4570481408106287454">"הגדרות אפליקציה"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"הגדרות מסך"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"‏הגדרות Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"‏הגדרות Bluetooth"</string>
@@ -1524,10 +1512,10 @@
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"‏צריכת הסוללה על ידי Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"‏כבה את Bluetooth כשאינך משתמש בו"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"‏נסה להתחבר למכשיר Bluetooth אחר"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"צריכת הסוללה על ידי יישומים"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"צריכת הסוללה על ידי אפליקציות"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"הפסק את האפליקציה או הסר אותה"</string>
-    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"‏שלוט ב-GPS באופן ידני כדי למנוע מהיישום להשתמש בו"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהיישום מציע הגדרות לצמצום צריכת הסוללה"</string>
+    <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"‏שלוט ב-GPS באופן ידני כדי למנוע מהאפליקציה להשתמש בו"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהאפליקציה מציעה הגדרות לצמצום צריכת הסוללה"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"סוללה בשימוש על ידי משתמש"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> מאז הניתוק"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"מאז הניתוק האחרון למשך <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"סטטיסטיקה של תהליך"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"סטטיסטיקה של מומחי מחשבים על התהליכים הפועלים"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"זיכרון בשימוש"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> אפליקציות במשך <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"רקע"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"חזית"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"בקובץ שמור"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"זיכרון המכשיר כעת הוא <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"‏שימוש ממוצע ב-RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏שימוש מרבי ב-RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"משך ההפעלה"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"שירותים"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"הצג מערכת"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"‏השתמש ב-Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"סוג נתונים סטטיסטיים"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"רקע"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"חזית"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"קובץ שמור"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"קלט ופלט קולי"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"הגדרות קלט ופלט קולי"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"חיפוש קולי"</string>
@@ -1576,7 +1552,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"הגדרות טקסט לדיבור"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"פלט טקסט לדיבור"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"השתמש תמיד בהגדרות שלי"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"הגדרות ברירת המחדל שלמטה עוקפות את הגדרות היישומים"</string>
+    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"הגדרות ברירת המחדל שלמטה עוקפות את הגדרות האפליקציות"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"הגדרות ברירת מחדל"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"מנוע ברירת המחדל"</string>
     <string name="tts_default_synth_summary" msgid="6482936537135251690">"מגדיר את מנוע סינתזת הדיבור לשימוש עבור טקסט מדובר"</string>
@@ -1671,11 +1647,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"גיבוי ושחזור"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"נתונים אישיים"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"גבה את הנתונים שלי"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"‏גבה נתוני יישומים, סיסמאות Wi-Fi והגדרות אחרות בשרתי Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"‏גבה נתוני אפליקציות, סיסמאות Wi-Fi והגדרות אחרות בשרתי Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"חשבון גיבוי"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"אף חשבון אינו מאחסן כרגע נתונים מגובים"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"שחזור אוטומטי"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"לאחר התקנה מחדש של יישום, שחזר את ההגדרות והנתונים המגובים"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"לאחר התקנה מחדש של אפליקציה, שחזר את ההגדרות והנתונים המגובים"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
@@ -1683,7 +1659,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"הסיסמה החדשה והאישור אינם תואמים"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"הגדרת סיסמת גיבוי נכשלה"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"‏האם להפסיק לגבות את סיסמאות ה-Wi-Fi, הסימניות, הגדרות אחרות ונתוני היישומים שלך ולמחוק את כל העותקים משרתי Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"‏האם להפסיק לגבות את סיסמאות ה-Wi-Fi, הסימניות, הגדרות אחרות ונתוני האפליקציות שלך ולמחוק את כל העותקים משרתי Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"הגדרות ניהול מכשיר"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"מנהל מכשיר"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"בטל הפעלה"</string>
@@ -1692,8 +1668,8 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"להפעיל את מנהל המכשיר?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"הפעל"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"מנהל מכשיר"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"הפעלת מנהל מערכת זה תאפשר ליישום <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"מנהל מערכת זה פעיל ומאפשר ליישום <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"הפעלת מנהל מערכת זה תאפשר לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
+    <string name="device_admin_status" msgid="4252975713178851910">"מנהל מערכת זה פעיל ומאפשר לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> לבצע את הפעולות הבאות:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"ללא כותרת"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"כללי"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"התראות"</string>
@@ -1736,9 +1712,9 @@
     <string name="sync_is_failing" msgid="1591561768344128377">"הסינכרון נתקל כעת בבעיות. הוא ימשיך תוך זמן קצר."</string>
     <string name="add_account_label" msgid="7811707265834013767">"הוסף חשבון"</string>
     <string name="background_data" msgid="5779592891375473817">"נתוני רקע"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"יישומים יכולים לסנכרן, לשלוח ולקבל נתונים בכל עת"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"אפליקציות יכולות לסנכרן, לשלוח ולקבל נתונים בכל עת"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"להשבית נתוני רקע?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"השבתה של נתוני הרקע מאריכה את חיי הסוללה ומצמצמת את השימוש בנתונים. ייתכן שיישומים מסוימים עדיין ישתמשו בחיבור נתוני הרקע."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"השבתה של נתוני הרקע מאריכה את חיי הסוללה ומצמצמת את השימוש בנתונים. ייתכן שאפליקציות מסוימות עדיין ישתמשו בחיבור נתוני הרקע."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"סנכרון נתונים אוטומטי"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"סינכרון מופעל"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"סינכרון כבוי"</string>
@@ -1755,7 +1731,7 @@
     <string name="sync_calendar" msgid="9056527206714733735">"‏יומן Google"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"אנשי קשר"</string>
     <string name="sync_plug" msgid="3905078969081888738">"‏"<font fgcolor="#ffffffff">"ברוכים הבאים אל סינכרון Google‏!"</font>" \nזוהי גישה של Google לסינכרון נתונים במטרה לאפשר לך גישה לאנשי קשר, לפגישות ועוד מכל מקום שבו אתה נמצא."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"הגדרות סנכרון יישומים"</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"הגדרות סנכרון אפליקציות"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"נתונים וסינכרון"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"שנה סיסמה"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"הגדרות חשבון"</string>
@@ -1763,17 +1739,16 @@
     <string name="header_add_an_account" msgid="756108499532023798">"הוסף חשבון"</string>
     <string name="finish_button_label" msgid="481587707657751116">"סיום"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"להסיר את החשבון?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטבלט!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטאבלט!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"הסרת חשבון זה תגרום למחיקה של כל ההודעות, אנשי הקשר ונתונים נוספים של החשבון מהטלפון!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"יישומים מסוימים מחייבים שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטבלט לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) ב\'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"יישומים מסוימים מחייבים שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטלפון לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) בנתיב \'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"אפליקציות מסוימות מחייבות שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטאבלט לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) ב\'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"אפליקציות מסוימות מחייבות שימוש בחשבון זה. ניתן להסירו רק על ידי איפוס הטלפון לערכי ברירת המחדל של היצרן (פעולה זו מוחקת את כל הנתונים האישיים) בנתיב \'הגדרות\' &gt; \'גיבוי ואיפוס\'."</string>
     <string name="provider_label" msgid="7724593781904508866">"‏מנויי Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"לא ניתן לסנכרן באופן ידני"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"אפשרות הסנכרון עבור פריט זה מושבתת כרגע. כדי לשנות את ההגדרה, הפעל באופן זמני את נתוני הרקע והסנכרון האוטומטי."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"‏הגדרות ‎4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"‏הגדר ונהל רשת ומודם של ‎4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏כתובת ‎4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"הקלד סיסמה לפענוח ההצפנה של אמצעי האחסון"</string>
     <string name="try_again" msgid="4272075051293936921">"נסה שוב."</string>
@@ -1785,19 +1760,19 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"‏בדיקת HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"‏הגדר אופן בדיקת HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"ניקוי באגים"</string>
-    <string name="debug_app" msgid="8349591734751384446">"בחר יישום לניקוי באגים"</string>
-    <string name="debug_app_not_set" msgid="718752499586403499">"לא הוגדר יישום לניקוי באגים"</string>
-    <string name="debug_app_set" msgid="2063077997870280017">"יישום ניקוי באגים: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="select_application" msgid="5156029161289091703">"בחר יישום"</string>
+    <string name="debug_app" msgid="8349591734751384446">"בחר אפליקציה לניקוי באגים"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"לא הוגדרה אפליקציה לניקוי באגים"</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"אפליקציה לניקוי באגים: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="select_application" msgid="5156029161289091703">"בחר אפליקציה"</string>
     <string name="no_application" msgid="2813387563129153880">"כלום"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"המתן למנקה באגים"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"יישום שנוקו בו הבאגים ממתין למנקה הבאגים לצירוף לפני ביצוע"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"אפליקציה שנוקו בה הבאגים ממתינה למנקה הבאגים לצירוף לפני ביצוע"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"קלט"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"שרטוט"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"עיבוד מואץ של חומרה"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"מעקב"</string>
     <string name="strict_mode" msgid="1938795874357830695">"מצב קפדני מופעל"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"גרום למסך להבהב כאשר יישומים מבצעים פעולות ארוכות בשרשור הראשי"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"גרום למסך להבהב כאשר אפליקציות מבצעות פעולות ארוכות בשרשור הראשי"</string>
     <string name="pointer_location" msgid="6084434787496938001">"מיקום מצביע"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"שכבת על של המסך המציגה את נתוני המגע הנוכחיים"</string>
     <string name="show_touches" msgid="1356420386500834339">"הצג נגיעות"</string>
@@ -1833,9 +1808,9 @@
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליך ברקע"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"‏הצג את כל פריטי ה-ANR"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'יישום לא מגיב\' עבור יישומים שפועלים ברקע"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'אפליקציה לא מגיבה\' עבור אפליקציות שפועלות ברקע"</string>
     <string name="experimental_webview" msgid="4492200819033780927">"השתמש בתצוגת אתר ניסיונית"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"יישומים ישתמשו בתצוגת האתר החדשה ביותר (ביטא)"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"אפליקציות ישתמשו בתצוגת האתר החדשה ביותר (ביטא)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"מחזור שימוש בנתונים"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"נדידת נתונים"</string>
@@ -1847,7 +1822,7 @@
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"סנכרון אוטומטי של נתונים"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"שנה את הגדרת המחזור…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"היום בחודש שבו יש לאפס את מחזור השימוש בנתונים:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"אף יישום לא השתמש בנתונים במהלך פרק זמן זה."</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"אף אפליקציה לא השתמשה בנתונים במהלך פרק זמן זה."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"חזית"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"רקע"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"מוגבל"</string>
@@ -1866,12 +1841,12 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"נתונים לנייד"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"‏נתוני 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"‏נתוני 4G"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"הצג את הגדרות היישום"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"הצג את הגדרות האפליקציה"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"הגבל נתוני רקע"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"השבת נתוני רקע ברשתות לנייד. ייעשה שימוש ברשתות שאינן לנייד, אם יהיו זמינות."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"כדי להגביל נתוני רקע לאפליקציה, הגדר תחילה מגבלת נתונים לנייד."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"להגביל נתוני רקע?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות.\n\nניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום לאפליקציה התלויה בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות.\n\nניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות באפליקציה."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"הגבלת נתוני הרקע אפשרית רק אם הגדרת מגבלת נתונים לנייד."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"האם להפעיל סנכרון אוטומטי של נתונים?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"‏שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטאבלט.\n\nחשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטאבלט. חשבון Google פועל בצורה כזאת.\n\nכדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
@@ -1887,19 +1862,19 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה.\n\nמכיוון שנפח העברת הנתונים נמדד על ידי הטאבלט, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה.\n\nמכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
-    <string name="data_usage_restrict_background" msgid="8447934953579275363">"‏אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"‏אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"‏אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"‏אם תגביל נתונים לנייד ברקע, אפליקציות ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"‏אם תגביל נתונים לנייד ברקע, אפליקציות ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"‏אם תגביל נתונים לנייד ברקע, אפליקציות ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"מגבלה"</font></string>
-    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"יישומים שהוסרו"</string>
-    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"יישומים ומשתמשים שהוסרו"</string>
+    <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"אפליקציות שהוסרו"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"אפליקציות ומשתמשים שהוסרו"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> התקבלו, <xliff:g id="SENT">%2$s</xliff:g> נשלחו"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטאבלט. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטלפון. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"נקודות חמות לנייד"</string>
-    <string name="data_usage_metered_body" msgid="4959032833706695848">"‏בחר את רשתות ה-Wi-Fi שהן נקודות חמות לנייד. ניתן להגביל את השימוש שיישומים עושים ברשתות אלה כאשר הם פועלים ברקע. יישומים יכולים גם להציג אזהרה לפני שימוש ברשתות אלה לביצוע הורדות גדולות."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"‏בחר את רשתות ה-Wi-Fi שהן נקודות חמות לנייד. ניתן להגביל את השימוש שאפליקציות עושות ברשתות אלה כאשר הן פועלות ברקע. אפליקציות יכולות גם להציג אזהרה לפני שימוש ברשתות אלה לביצוע הורדות גדולות."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</string>
     <string name="data_usage_metered_wifi" msgid="8540872226614404873">"‏רשתות Wi-Fi"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"‏כדי לבחור נקודות חמות לנייד, הפעל את ה-Wi-Fi."</string>
@@ -1969,7 +1944,7 @@
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"הוסף משתמש או פרופיל"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"פרופיל מוגבל"</string>
-    <string name="user_need_lock_message" msgid="2596365678651842785">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על היישומים ועל הנתונים האישיים שלך."</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על האפליקציות ועל הנתונים האישיים שלך."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"הגדר נעילה"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"לא מוגדר - פרופיל מוגבל"</string>
@@ -1977,13 +1952,13 @@
     <string name="user_you" msgid="1639158809315025986">"אתה (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"הוספה"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"למשתמשים יש יישומים ותוכן משלהם"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"למשתמשים יש אפליקציות ותוכן משלהם"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ניתן להגביל את הגישה לאפליקציות ולתוכן מהחשבון שלך"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"משתמש"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"פרופיל מוגבל"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"‏ניתן לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם.\n\nלאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"‏ניתן לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם אפליקציות, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם.\n\nלאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות אפליקציה מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות אפליקציה מעודכנות בשם כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ודא שהאדם זמין לקחת את הטאבלט ולהגדיר את השטח שלו"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"האם להגדיר פרופיל עכשיו?"</string>
@@ -2007,9 +1982,9 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"מוסיף משתמשים חדשים…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"מחק משתמש"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"מחק"</string>
-    <string name="application_restrictions" msgid="8207332020898004394">"אפשר יישומים ותוכן"</string>
-    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"יישומים והגבלות"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור היישום"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"אפשר אפליקציות ותוכן"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"אפליקציות והגבלות"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור האפליקציה"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"הסר את התקנת האפליקציה הזו"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
@@ -2028,13 +2003,12 @@
     <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"שידורים סלולריים"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"בחר את סוגי התראות החירום להצגה."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"הגבלות על אפליקציות ותוכן"</string>
     <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"הגדר הגבלות אפליקציה"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"בשליטת <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="913035259626149121">"יישום זה אינו נתמך בפרופילים מוגבלים"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"היישום הזה יכול לגשת לחשבונות שלך"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"אפליקציה זו אינה נתמכת בפרופילים מוגבלים"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"האפליקציה הזו יכולה לגשת לחשבונות שלך"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"‏רשת Wi‑Fi ורשת לנייד"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"‏אפשר שינוי של הגדרות רשת Wi-Fi ורשת לנייד"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
@@ -2043,7 +2017,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"אפשר חילופי מידע כאשר הטלפון נוגע במכשיר אחר"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"מיקום"</string>
-    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"התר ליישום להשתמש במידע המיקום שלך"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"התר לאפליקציה להשתמש בנתוני המיקום שלך"</string>
     <string name="wizard_back" msgid="5567007959434765743">"הקודם"</string>
     <string name="wizard_next" msgid="3606212602795100640">"הבא"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"סיום"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 385e3b2..88707cb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -135,8 +135,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"接続"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"接続済み(電話を除く)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"接続済み(メディアを除く)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"接続済み(メッセージへのアクセスなし)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"接続済み(電話/メディアを除く)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"切断"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"切断中..."</string>
@@ -167,13 +166,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth接続リクエスト"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続するにはタップしてください。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続してもよろしいですか?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"電話帳へのアクセスのリクエスト"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$sが連絡先と通話履歴にアクセスしようとしています。%2$sにアクセスを許可しますか?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"次回から表示しない"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"次回から表示しない"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"メッセージへのアクセスのリクエスト"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
@@ -187,7 +184,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g>を開始"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"アカウント:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"プロキシ設定"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"プロキシ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"消去"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"プロキシポート"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"プロキシを不使用"</string>
@@ -485,8 +482,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"入力デバイス"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"インターネットアクセス"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"メッセージへのアクセス"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はメディアの音声から切断されます。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>はハンズフリー音声デバイスから切断されます。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>は入力デバイスから切断されます。"</string>
@@ -502,8 +498,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"地図に接続済み"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"入力デバイスに接続されています"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"インターネットアクセス用に接続"</string>
@@ -513,8 +508,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"入力に使用"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"インターネットアクセスに使用する"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地図に使用"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ホルダーの設定"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"音声をホルダーに出力"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"スピーカーフォン"</string>
@@ -542,15 +536,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"ON"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"OFF"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"無効"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"認証"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"セッション情報"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"リッスンモードの有効化"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"自立型グループオーナーの有効化"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"一時停止"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"再開"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPSの設定"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"リッスンチャネル"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"オペレーティングチャネル"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
@@ -706,8 +691,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fiアクセスポイントをセットアップ"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
@@ -1007,7 +991,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"モバイルプランの管理"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"モバイルプラン"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"デフォルトのSMSアプリ"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMSアプリを変更しますか?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"SMSアプリとして<xliff:g id="CURRENT_APP">%s</xliff:g>の代わりに<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"不明なSIM事業者"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$sには既知のプロビジョニングウェブサイトがありません"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
@@ -1016,7 +1003,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"モード"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"バッテリー節約"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"端末センサーのみ"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"現在地OFF"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近の位置情報リクエスト"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"位置情報を最近リクエストしたアプリはありません"</string>
@@ -1380,12 +1368,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分<xliff:g id="SECONDS">%3$d</xliff:g>秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>日<xliff:g id="HOURS">%2$d</xliff:g>時間<xliff:g id="MINUTES">%3$d</xliff:g>分"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>分"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"使用統計情報"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用統計情報"</string>
     <string name="display_order_text" msgid="8592776965827565271">"並べ替え:"</string>
@@ -1452,8 +1437,7 @@
     <string name="print_settings" msgid="4742428530112487843">"印刷"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"印刷サービス"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ドキュメントは1つ以上のサーバーを経由してプリンタに送信されることがあります。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"プリンタを追加"</string>
@@ -1462,12 +1446,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"サービスを追加"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"プリンタを追加"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"検索"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"プリンタの検索中"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"印刷ジョブ"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"アクティブな印刷ジョブ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"電池の使用状況"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"電池使用量データがありません。"</string>
@@ -1547,33 +1528,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"プロセスの統計情報"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"プロセスの実行に関する独自の統計情報"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"メモリ使用"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>アプリ(<xliff:g id="TIME">%2$s</xliff:g>)"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"バックグラウンド"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"フォアグラウンド"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"キャッシュ"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"現在の端末メモリの状態は「<xliff:g id="MEMSTATE">%1$s</xliff:g>」です"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"平均RAM使用量"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"最大RAM使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"実行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"システムを表示"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Ussを使用"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計タイプ"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"バックグラウンド"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"フォアグラウンド"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"キャッシュ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"音声入出力"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"音声入出力の設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"音声検索"</string>
@@ -1785,8 +1754,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G設定"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4Gネットワークとモデムの設定と管理"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
     <string name="enter_password" msgid="4131758584074246224">"ストレージを復号化するパスワードを入力してください"</string>
     <string name="try_again" msgid="4272075051293936921">"もう一度お試しください。"</string>
@@ -1972,18 +1940,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ネットワークが監視される場合があります"</string>
+    <string name="done_button" msgid="1991471253042622230">"完了"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ネットワーク監視"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"この端末は<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>によって管理されています。\n\n管理者はあなたのネットワークアクティビティ(メール、アプリ、保護されたウェブサイトなど)を監視できます。\n\n詳しくは管理者にお問い合わせください。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三者があなたのネットワーク\nアクティビティ(メール、アプリ、保護されたウェブサイトなど)を監視できます。\n\nこれは、信頼できる認証情報が端末にインストールされているためです。"</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"信頼できる認証情報を確認"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロフィール"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"ユーザーまたはプロフィールを追加"</string>
@@ -2029,8 +1991,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"このアプリをアンインストール"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
@@ -2048,7 +2009,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"緊急警報"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"表示する緊急警報の種類を選択してください。"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"アプリとコンテンツの制限"</string>
     <string name="user_rename" msgid="8523499513614655279">"名前を変更"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"アプリの制限を設定"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 361a5e4..ed0dc12 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"შეერთებულია"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"დაკავშირებულია (ტელეფონის გარდა)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"მიერთებულია (მედიის გარდა)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"დაკავშირებულია (შეტყობინებაზე წვდომა არ არის)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"დაკავშირება (გარდა ტელეფონისა და მედიისა)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"კავშირი გაწყვეტილია"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"მიმდინარეობს გათიშვა…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-ის დაკავშირების თხოვნა"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"დასაკავშირებლად შეეხეთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-ს."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"გსურთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-თან დაკავშირება?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ტელეფონების წიგნზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s სურს თქვენს კონტაქტებსა და ზარების ჟურნალთან დაკავშირება. ვუზრუნველყოთ %2$s წვდომით?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"აღარ მკითხო"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"აღარ მკითხო"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"შეტყობინებებზე წვდომის მოთხოვნა"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s-ს უნდა თქვენს შეტყობინებებზე წვდომა. მისცემთ %2$s-ს წვდომას?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"თარიღის და დროის პარამეტრები"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"დაიწყე <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"ანგარიში"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"პროქსი-სერვერის პარამეტრები"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"პროქსი"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"გაწმენდა"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"პროქსი-სერვერის პორტი"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"აქვს Bypass პროქსი"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"შეყვანის მოწყობილობა"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ინტერნეტზე წვდომა"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ინტერნეტ კავშირის გაზიარება"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"შეტყობინებებზე წვდომა"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება მედია აუდიოსგან."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება უხელო რეჟიმის აუდიოდან."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> გაითიშება შენატანი მოწყობილობისგან."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"დაკავშირებულია აუდიო მულტიმედიურ სისტემასთან"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"დაკავშირებულია ტელეფონის აუდიო მოწყობილობასთან"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"დაკავშირებულია ფაილების გადაცემის სერვერთან"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"რუკასთან დაკავშირებული"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"არ არის დაკავშირებული ფაილების ტრანსფერის სერვერთან"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"დაკავშირებულია შეყვანის მოწყობილობასთან"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"დაკავშირებულია მოწყობილობასთან ინტერნეტთან წვდომისთვის"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ფაილების ტრანსფერისათვის გამოყენება"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"შეტანისთვის გამოყენება"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"გამოიყენე ინტერნეტთან წვდომისთვის"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"რუკაზე გამოყენება"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"სამაგრის პარამეტრები"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"აუდიოსთვის სამაგრის გამოყენება"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ხმამაღლამოსაუბრე კავშირისათვის"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"ჩართული"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"გამორთულია"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"გამორთული"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"სერტიფიცირება"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"სესიის ინფორმაცია"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"მოსმენის რეჟიმის ჩართვა"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"ავტონომიური GO-ს ჩართვა"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"პაუზა"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"გაგრძელება"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS კონფიგურაცია"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"მოსმენის არხი"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"ოპერირების არხი"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ტაბლეტის სხვა მოწყობილობასთან შეხებისას მონაცემთა გაცვლის საშუალება"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"მონაცემთა გაცვლის უფლების მიცემა ტელეფონის სხვა მოწყობილობასთან შეხებისას"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"დააყენეთ Wi‑Fi უსადენო ქსელი"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> პორტატიული Wi‑Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"სახლი"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კავშირი გაწყდება."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"დახმარება"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"მობილური ქსელები"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"მობილური გეგმის მართვა"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"მობილური სატარიფო გეგმა"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"ნაგულისხმევი SMS აპი"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"შეიცვალოს SMS-ის აპი?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"გსურთ, <xliff:g id="CURRENT_APP">%s</xliff:g>-ის ნაცვლად გამოიყენოთ <xliff:g id="NEW_APP">%s</xliff:g> თქვენს SMS აპლიკაციად?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-ის ოპერატორი უცნობია"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-ს განთავსების ნაცნობი საიტი არ გააჩნია"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"გთხოვთ, ჩადოთ SIM ბარათი და გადატვირთოთ"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"რეჟიმი"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"მაღალი სიზუსტე"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ბატარეის დაზოგვა"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"მხოლოდ მოწყობილობის სენსორები"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"მდებარეობა გამორთულია"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"მდებარეობის ბოლო მოთხოვნები"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ბოლო დროს აპებს მდებარეობის ინფორმაცია არ მოუთხოვია"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>სთ <xliff:g id="MINUTES">%2$d</xliff:g>წთ <xliff:g id="SECONDS">%3$d</xliff:g>წმ"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>წთ. <xliff:g id="SECONDS">%2$d</xliff:g>წმ."</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> წმ"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>დღ <xliff:g id="HOURS">%2$d</xliff:g>სთ <xliff:g id="MINUTES">%3$d</xliff:g>წთ"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>სთ <xliff:g id="MINUTES">%2$d</xliff:g>წთ"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>წთ"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"გამოყენების სტატისტიკა"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"გამოყენების სტატისტიკა"</string>
     <string name="display_order_text" msgid="8592776965827565271">"სორტირება:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ბეჭდვის სერვისები"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"სანამ პრინტერს მიაღწევდეს, შესაძლოა თქვენმა დოკუმენტმა სხვადასხვა სერვერს გაუაროს."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"სერვისები დაყენებული არ არის"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"პარამეტრები"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"პრინტერების დამატება"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"სერვისის დამატება"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"პრინტერის დამატება"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ძიება"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"მიმდინარეობს პრინტერების ძიება"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"ბეჭდვის დავალებები"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"აქტიური ბეჭდვის დავალებები"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ბატარეა"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"რაზე იხარჯება ბატარეის მუხტი"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ელემენტის მოხმარების მონაცემები მიუწვდომელია."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"პროცესის სტატისტიკა"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"მიმდინარე პროცესების შემაჯამებელი სტატისტიკა"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"გამოყენებული მეხსიერება"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> აპი, <xliff:g id="TIME">%2$s</xliff:g>-ის ფარგლებში"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"ფონი"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"წინა პლანი"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ქეშირებული"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ამჟამად მოწყობილობის მეხსიერება არის <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM-ის საშუალო გამოყენება"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ის მაქსიმალური გამოყენება"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"გაშვების დრო"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"სერვისები"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"სისტემის ჩვენება"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uss-ის გამოყენება"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"სტატისტიკის ტიპი"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ფონი"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"წინა პლანი"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ქეშირებული"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ხმის შეტანა და გამოტანა"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ხმოვანი შეყვანისა და გამოტანის პარამეტრები"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ხმოვანი ძიება"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"შეუძლებელია ერთობლივი სინქრონიზაცია"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"სინქრონიზაცია გამორთულია. პარამეტრების შესაცვლელად დროებით ჩართეთ მონაცემების ფონური და ავტომატური სინქრონიზაცია."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G პარამეტრები"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G ქსელისა და მოდემის პარამეტრების დაყენება და მართვა"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC მისამართი"</string>
     <string name="enter_password" msgid="4131758584074246224">"საცავის გასაშიფრად აკრიფეთ პაროლი"</string>
     <string name="try_again" msgid="4272075051293936921">"სცადეთ ხელახლა."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"გამორთულია"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"მხოლოდ გაფრთხილება"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"სრულდება"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"შესაძლოა ქსელზე ხორციელდება მონიტორინგი"</string>
+    <string name="done_button" msgid="1991471253042622230">"დასრულება"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ქსელის მონიტორინგი"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"ამ მოწყობილობის მმართველი არის: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nთქვენს ადმინისტრატორს შეუძლია განახორციელოს თქვენი ქსელის აქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო ვებსაიტების მონიტორინგი.\n\nდამატებითი ინფორმაციისათვის, დაუკავშირდით ადმინისტრატორს."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"მესამე მხარეს შეუძლია განახორციელოს თქვენი ქსელის \nაქტივობის მონიტორინგი, მათ შორის ელფოსტების, აპების და უსაფრთხო ვებსაიტების.\n\nეს შესაძლებელია თქვენს მოწყობილობაზე დაყენებული სანდო სამომხმარებლო მონაცემების საშუალებით."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"სანდო სამომხმარებლო მონაცემების შემოწმება"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"მომხმარებლები"</string>
     <string name="user_list_title" msgid="7937158411137563543">"მომხმარებლები და პროფილები"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"მომხმარებლის ან პროფილის დამატება"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"აპებისა და კონტენტის დაშვება"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"აპლიკაციები შეზღუდვებით"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"აპლიკაციის პარამეტრების გაფართოება"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"ამ აპლიკაციის დეინსტალაცია"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ეს პარამეტრები გავრცელდება ამ ტაბლეტის ყველა მომხმარებელზე."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ეს პარამეტრები გავრცელდება ამ ტელეფონის ყველა მომხმარებელზე."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ენის შეცვლა"</string>
@@ -2032,8 +1993,8 @@
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"Payments"</string>
     <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"დაყენდეს, როგორც უპირატესი?"</string>
-    <string name="nfc_payment_set_default" msgid="5427393822785989090">"შეხებით გადახდისას გსურთ ყოველთვის <xliff:g id="APP">%1$s</xliff:g> გამოიყენოთ?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"შეხებით გადახდისას, გსურთ ყოველთვის <xliff:g id="APP_0">%1$s</xliff:g> გამოიყენოთ, <xliff:g id="APP_1">%2$s</xliff:g>-ის ნაცვლად?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"შეხებით გადახდისას, გსურთ, ყოველთვის <xliff:g id="APP">%1$s</xliff:g> გამოიყენოთ?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"შეხებით გადახდისას, გსურთ, ყოველთვის <xliff:g id="APP_0">%1$s</xliff:g> გამოიყენოთ, <xliff:g id="APP_1">%2$s</xliff:g>-ის ნაცვლად?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"შეზღუდვები"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"შეზღუდვების მოშორება"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN-ის შეცვლა"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"ანგარიში კონტენტისთვის"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ფოტოს ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"მობილური ოპერატორები"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"გადაუდებელი გაფრთხილებების ტიპების არჩევა საჩვენებლად."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"აპლიკაციისა და კონტენტის შეზღუდვები"</string>
     <string name="user_rename" msgid="8523499513614655279">"გადარქმევა"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"აპის შეზღუდვების დაყენება"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d911b94..2273ad4 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"ចាប់ផ្ដើម <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"គណនី៖"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"ការកំណត់​ប្រូកស៊ី"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"ប្រូកស៊ី"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"សម្អាត"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"ច្រកប្រូកស៊ី"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ប្រូកស៊ី​សម្រាប់"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"បើក"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"បិទ"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"បិទ"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"វិញ្ញាបនបត្រ"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"ព័ត៌មាន​សម័យ"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"បើក​របៀប​ស្ដាប់"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"បើក​​ឲ្យ​ចូល​​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"ផ្អាក"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"បន្ត"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"ការ​​កំណត់​រចនា​សម្ព័ន្ធ WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"ស្ដាប់​ឆានែល"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"អនុវត្ត​ឆានែល"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ជំនួយ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"បណ្ដាញ​ចល័ត"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"គ្រប់គ្រង​ផែនការ​ចល័ត"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ផែនការ​ទិន្នន័យ​ចល័ត"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"កម្មវិធី​ផ្ញើ​សារ SMS ​លំនាំ​ដើម"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ប្ដូរ​កម្មវិធី​សារ SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជំនួស​ឱ្យ <xliff:g id="CURRENT_APP">%s</xliff:g> ជា​កម្មវិធី​ផ្ញើ​សារ SMS របស់​អ្នក​?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"មិន​ស្គាល់​​ប្រតិបត្តិ​ករ​​ស៊ីមកាត"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មាន​តំបន់​បណ្ដាញ​ដែល​ផ្ដល់​បាន​​ស្គាល់"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"សូម​បញ្ចូល​ស៊ីមកាត និង​ចាប់ផ្ដើម​ឡើង​វិញ"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"របៀប"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"ឧបករណ៍​ចាប់​សញ្ញា​បាន​តែ​ឧបករណ៍"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ម៉ោង <xliff:g id="MINUTES">%2$d</xliff:g>នាទី <xliff:g id="SECONDS">%3$d</xliff:g>វិនាទី"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>នាទី <xliff:g id="SECONDS">%2$d</xliff:g>វិនាទី"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> វិនាទី"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> ថ្ងៃ <xliff:g id="HOURS">%2$d</xliff:g> ម៉ោង <xliff:g id="MINUTES">%3$d</xliff:g>​ នាទី"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> ម៉ោង <xliff:g id="MINUTES">%2$d</xliff:g> នាទី"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> នាទី"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"ស្ថិតិ​ប្រើ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ស្ថិតិ​ប្រើប្រាស់"</string>
     <string name="display_order_text" msgid="8592776965827565271">"តម្រៀប​តាម៖"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"ការ​បោះពុម្ព"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"សេវាកម្ម​បោះពុម្ព"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ឯកសារ​របស់​អ្នក​អាច​ឆ្លង​កាត់​ម៉ាស៊ីន​មេ​មួយ ឬ​ច្រើន​ដើម្បី​ទៅ​ដល់​ម៉ាស៊ីន​បោះពុម្ព។"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ការ​កំណត់"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"បន្ថែម​ម៉ាស៊ីន​បោះពុម្ព"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"បន្ថែម​សេវាកម្ម"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"បន្ថែម​ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ស្វែងរក"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"ស្វែងរក​​ម៉ាស៊ីន​បោះពុម្ព"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"ការងារ​បោះពុម្ព"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"ការ​ងារ​បោះពុម្ព​សកម្ម"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ថ្ម"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"អ្វី​​ដែល​កំពុង​​ប្រើ​ថ្ម"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"មិន​មាន​ទិន្នន័យ​ការ​ប្រើ​ថ្ម"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ស្ថិតិ​​ដំណើរការ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ស្ថិតិ Geeky អំពី​ដំណើរការ"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> កម្មវិធី​ចប់​នៅ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"ផ្ទៃ​ខាង​ក្រោយ"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"ផ្ទៃ​ខាង​មុខ"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ទុក​ក្នុង​ឃ្លាំង"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ការ​ប្រើ​អង្គ​ចងចាំ​មធ្យម"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"ពេល​ដំណើរការ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"សេវាកម្ម"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"បង្ហាញ​ប្រព័ន្ធ"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"ប្រើ Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ផ្ទៃ​ខាង​ក្រោយ"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ផ្ទៃ​ខាង​មុខ"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ទុក​ក្នុង​ឃ្លាំង"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម​ដោយ​ដៃ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"បច្ចុប្បន្ន​បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​សម្រាប់​​ធាតុ​នេះ។ ដើម្បី​ប្ដូរ​ការ​កំណត់​នេះ បើក​ទិន្នន័យ​​ផ្ទៃ​ខាង​ក្រោយ និង​ធ្វើ​សម​កាល​កម្ម​​ស្វ័យ​ប្រវត្តិ​ជា​បណ្ដោះអាសន្ន។"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"ការកំណត់ 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"រៀបចំ &amp; គ្រប់គ្រង​បណ្ដាញ 4G និង​ម៉ូដឹម"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"អាសយដ្ឋាន 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"បញ្ចូល​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ឧបករណ៍​ផ្ទុក"</string>
     <string name="try_again" msgid="4272075051293936921">"ព្យាយាម​ម្ដង​ទៀត។"</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"គណនី​សម្រាប់​មាតិកា"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"លេខ​សម្គាល់​រូបថត"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"ការ​ផ្សាយ​ចល័ត"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"ជ្រើស​ប្រភេទ​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន​ត្រូវ​បង្ហាញ"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"ការ​ដាក់​កម្រិត​កម្មវិធី និង​មាតិកា"</string>
     <string name="user_rename" msgid="8523499513614655279">"ប្ដូរ​ឈ្មោះ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"កំណត់​ការ​ដាក់កម្រិត​កម្មវិធី"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bc67874..e738473 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"연결됨(전화 없음)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"연결됨(미디어 없음)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"연결됨(메시지 액세스 없음)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"연결됨(전화 또는 미디어 없음)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"연결 끊김"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"연결을 끊는 중…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"블루투스 연결 요청"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하려면 터치하세요."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하시겠습니까?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"전화번호부 액세스 요청"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s이(가) 주소록과 통화 기록에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"다시 묻지 않음"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"다시 묻지 않음"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"메시지 액세스 요청"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> 시작"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"계정:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"프록시 설정"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"프록시"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"지우기"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"프록시 포트"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"프록시 우회 대상:"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"입력 장치"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"인터넷 액세스"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"메시지 액세스"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 미디어 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 핸즈프리 오디오의 연결이 끊어집니다."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 입력 장치의 연결이 끊어집니다."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대전화 오디오에 연결됨"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"지도에 연결됨"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"파일 전송 서버에 연결되지 않았습니다."</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"입력 장치에 연결됨"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"인터넷 액세스를 위해 기기에 연결됨"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"파일 전송에 사용"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"입력에 사용"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"인터넷 액세스에 사용"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"지도에 사용"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"도크 설정"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"오디오에 도크 사용"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"스피커폰으로 사용"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"사용"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"사용 안함"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"사용 중지됨"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"인증서"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"세션 정보"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"수신 모드 사용"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"단독 그룹 소유자 모드 사용"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"일시중지"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"재개"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS 설정"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"채널 수신"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"운영 채널"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"태블릿이 다른 기기와 접촉하면 데이터 교환 허용"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"휴대전화가 다른 기기와 접촉하면 데이터 교환 허용"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi 핫스팟 설정"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SECURITY">%2$s</xliff:g><xliff:g id="NETWORK_SSID">%1$s</xliff:g> 휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"모바일 요금제 관리"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"모바일 요금제"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"기본 SMS 앱"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS 앱을 변경하시겠습니까?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"SMS 애플리케이션으로 <xliff:g id="CURRENT_APP">%s</xliff:g> 대신 <xliff:g id="NEW_APP">%s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"알 수 없는 SIM 운영자입니다."</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s에 알려진 프로비저닝 웹사이트가 없습니다."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"모드"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"높은 정확성"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"배터리 절약"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"기기 센서 전용"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"위치 정보 사용 안함"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"최근 위치 요청"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"최근에 위치 정보를 요청한 앱이 없습니다."</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분 <xliff:g id="SECONDS">%3$d</xliff:g>초"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>분 <xliff:g id="SECONDS">%2$d</xliff:g>초"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>초"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>일 <xliff:g id="HOURS">%2$d</xliff:g>시간 <xliff:g id="MINUTES">%3$d</xliff:g>분"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>분"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"사용 통계"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"사용 통계"</string>
     <string name="display_order_text" msgid="8592776965827565271">"정렬 기준:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"프린트 서비스"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"문서가 프린터로 전송되는 중에 하나 이상의 서버를 통과할 수 있습니다."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"프린터 추가"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"서비스 추가"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"프린터 추가"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"검색"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"프린터 검색 중"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"인쇄 작업"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"진행 중인 인쇄 작업"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"배터리"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"배터리 사용 세부정보"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"배터리 사용 데이터가 없습니다."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"프로세스 통계"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"프로세스 실행에 관한 통계"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"메모리 사용량"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g>을(를) 초과하는 <xliff:g id="TYPE">%1$s</xliff:g> 앱"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"백그라운드"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"포그라운드"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"캐시된 프로세스"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"현재 기기 메모리 수준: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"평균 RAM 사용"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"최대 RAM 사용"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"재생 시간"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"시스템 표시"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uss(Unique Set Size) 사용"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"통계 유형"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"백그라운드"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"포그라운드"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"캐시된 프로세스"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"음성 입력 &amp; 출력"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"음성 입력 &amp; 출력 설정"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"음성 검색"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 이 설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 설정"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G 네트워크와 모뎀 설정 및 관리"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
     <string name="enter_password" msgid="4131758584074246224">"저장소 암호를 해독하려면 비밀번호를 입력하세요."</string>
     <string name="try_again" msgid="4272075051293936921">"다시 시도해 보세요."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"네트워크가 모니터링될 수 있음"</string>
+    <string name="done_button" msgid="1991471253042622230">"완료"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"네트워크 모니터링"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"이 기기는 <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>에서 관리합니다.\n\n관리자는 이메일, 앱 및 보안 웹사이트를 포함한 네트워크 활동을 모니터링할 수 있습니다.\n\n자세한 정보는 관리자에게 문의하세요."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">\n\n"기기에 신뢰할 수 있는 자격증명이 설치되어있기 때문에 제3자가 이메일, 앱 및 보안 웹사이트를 포함한 네트워크\n활동을 모니터링할 수 있습니다."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"신뢰할 수 있는 자격증명 확인"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
     <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"사용자 또는 프로필 추가"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"애플리케이션 제거"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"애플리케이션 및 콘텐츠 제한"</string>
     <string name="user_rename" msgid="8523499513614655279">"이름 바꾸기"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"앱 제한 설정"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 9b395ae..7c1c4ed 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"ເລີ່ມ <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"ບັນຊີ:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"ການຕັ້ງຄ່າ Proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"ພຣັອກຊີ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"ລຶບ"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"ພອດ Proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ບໍ່ໃຊ້ Proxy ສຳລັບ"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"ເປີດ"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"ປິດ"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ປິດການນຳໃຊ້"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"ການຮັບຮອງ"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"ຂໍ້​ມູນ​ເຊດຊັນ"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"ເປີດນຳໃຊ້ໂໝດຮັບຟັງ"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"ເປີດນຳໃຊ້ GO ອິດສະຫຼະ"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"ຢຸດຊົ່ວຄາວ"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"ສືບຕໍ່"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"ການ​ຕັ້ງ​ຄ່າ WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"ຊ່ອງຮັບຟັງ"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"ຊ່ອງການດຳເນີນການປະຕິບັດ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ອະນຸຍາດໃຫ້ແລກປ່ຽນຂໍ້ມູນເມື່ອນຳແທັບເລັດ ໄປແຕະໃສ່ອຸປະກອນອື່ນ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ອະນຸຍາດໃຫ້ມີການແລກປ່ຽນຂໍ້ມູນເມື່ອ ໂທລະສັບແຕະກັບອຸປະກອນອື່ນ"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຍົກເລີກການປ່ອຍສັນຍານ."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ຊ່ວຍເຫຼືອ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"ເຄືອຂ່າຍມືຖື"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"ຈັດການແຜນມືຖື"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ແພັກເກດມືຖື"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"ແອັບຯ SMS ເລີ່ມຕົ້ນ"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ປ່ຽນແອັບຯສົ່ງ SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເປັນແອັບຯສົ່ງ SMS ແທນ <xliff:g id="CURRENT_APP">%s</xliff:g> ບໍ່?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ບໍ່ຮູ້ຈັກຜູ່ໃຫ້ບໍລິການ SIM ນີ້"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ບໍ່ມີເວັບໄຊທີ່ຮູ້ຈັກກຳລັງຖືກກະກຽມ"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ກະ​ລຸ​ນາ​ໃສ່​ຊິມກາດ ​ແລະເປີດເຄື່ອງຄືນໃໝ່"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"ໂຫມດ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ຄວາມຖືກຕ້ອງສູງ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ປະຢັດໄຟ"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"ເຊັນເຊີຂອງອຸປະກອນເທົ່ານັ້ນ"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ຂໍ້ມູນສະຖານທີ່ແມ່ນປິດຢູ່"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ການຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ຫຼ້າສຸດນີ້ບໍ່ມີແອັບຯໃດເອີ້ນໃຊ້ຂໍ້ມູນຕຳແໜ່ງ"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ຊມ <xliff:g id="MINUTES">%2$d</xliff:g>ນທ <xliff:g id="SECONDS">%3$d</xliff:g>ວ"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ນ <xliff:g id="SECONDS">%2$d</xliff:g>ວ"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>ວິ"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>ມ <xliff:g id="HOURS">%2$d</xliff:g>ຊ <xliff:g id="MINUTES">%3$d</xliff:g>ນ"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ຊ <xliff:g id="MINUTES">%2$d</xliff:g>ນ"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>ນ"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"ສະຖິຕິການນຳໃຊ້"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"ສະຖິຕິການນຳໃຊ້"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ຮຽງຕາມ:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"ການ​ພິມ"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"ບໍລິການພິມ"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"ເອກະສານຂອງທ່ານອາດຜ່ານນຶ່ງ ຫຼືຫຼາຍກວ່ານຶ່ງເຊີບເວີເພື່ອໄປໃຫ້ຮອດເຄື່ອງພິມ."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ການຕັ້ງຄ່າ"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ຕື່ມ​ເຄື່ອງພິມ"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"ເພີ່ມບໍລິການ"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ເພີ່ມເຄື່ອງພິມ"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ຊອກຫາ"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"ກຳລັງຊອກຫາເຄື່ອງພິມ"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"ວຽກພິມທີ່ດຳເນີນຢູ່"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ແບັດເຕີຣີ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ມີຫຍັງແດ່ທີ່ໃຊ້ແບັດເຕີຣີ"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ບໍ່ມີຂໍ້ມູນການນຳໃຊ້ແບັດເຕີຣີ."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ສະຖິຕິໂປຣເຊສ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ສະຖານະ Geeky ກ່ຽວກັບໂປຣເຊສທີ່ກຳລັງເຮັດວຽກຢູ່"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"ໜ່ວຍຄວາມຈຳທີ່ໃຊ້"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> ແອັບຯໃນໄລຍະເວລາ <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"ພື້ນຫຼັງ"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"ພື້ນໜ້າ"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"ໃນໜ່ວຍຄວາມຈຳ"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ໜ່ວຍຄວາມຈຳຂອງອຸປະກອນຕອນນີ້ແມ່ນ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"ການນຳໃຊ້ RAM ໂດຍສະເລ່ຍ"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ການນຳໃຊ້ RAM ສູງສຸດ"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"ເວລາເຮັດວຽກ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ບໍລິການ"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"ສະແດງລະບົບ"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"ໃຊ້ USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"ປະເພດສະຖິຕິ"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"ພື້ນຫຼັງ"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ພື້ນໜ້າ"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ໃນໜ່ວຍຄວາມຈຳ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ການຕັ້ງປ້ອນຂໍ້ມູນສຽງເຂົ້າ &amp; ອອກ"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ການຕັ້ງຄ່າປ້ອນຂໍ້ມູນສຽງເຂົ້າ &amp; ອອກ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ຊອກຫາດ້ວຍສຽງ"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນເອງໄດ້"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ການຊິ້ງຂໍ້ມູນຂອງລາຍການນີ້ຖືກປິດຢູ່. ເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້, ໃຫ້ເປິດການນຳໃຊ້ຂໍ້ມູນພື້ນຫຼັງ ແລະການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຊົ່ວຄາວ."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"ຕັ້ງຄ່າ 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"ຕັ້ງຄ່າ &amp; ຈັດການເຄືອຂ່າຍ ແລະໂມເດັມ 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"ພິມລະຫັດຜ່ານເພື່ອຖອດລະຫັດບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
     <string name="try_again" msgid="4272075051293936921">"ລອງໃໝ່ອີກຄັ້ງ."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"ບັນຊີສຳລັບເນື້ອຫາ"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ຮູບປະຈຳໂຕ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"ການກະຈາຍສັນຍານໂທລະສັບ"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"ເລືອກປະເພດການແຈ້ງເຕືອນສຸກເສີນເພື່ອສະແດງ."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"ການຈຳກັດແອັບພລິເຄຊັນ ແລະ ເນື້ອຫາ"</string>
     <string name="user_rename" msgid="8523499513614655279">"ປ່ຽນຊື່"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ກໍາ​ນົດ​ຂໍ້​ຈໍາ​ກັດແອັບຯ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 23af143..7f25145 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Pradėti <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Paskyra:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Tarpinio serverio nustatymai"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Tarpinis serveris"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Išvalyti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Tarpinio serverio prievadas"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Išjungti įgaliotąjį serverį, skirtą"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Įjungta"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Išjungta"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Neleidžiama"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifikavimas"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Seanso informacija"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Įgalinti klausymo režimą"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Įgalinti autonominį GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pristabdyti"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Tęsti"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS konfigūracija"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Klausomas kanalas"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Veikiantis kanalas"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Tvarkykite mobiliojo planą"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiliojo ryšio planas"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Numatytoji SMS programa"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Pakeisti SMS programą?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Kaip SMS programą vietoje „<xliff:g id="CURRENT_APP">%s</xliff:g>“ naudoti „<xliff:g id="NEW_APP">%s</xliff:g>“?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nežinomas SIM operatorius"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"„%1$s“ neturi aprūpinimo svetainės"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Įdėkite SIM kortelę ir paleiskite iš naujo"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Itin tikslu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Skirta tik įreng. jutikliams"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Vietovė išjungta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pastarosios vietovės užklausos"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min. <xliff:g id="SECONDS">%3$d</xliff:g> sek."</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> sek."</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> val. <xliff:g id="MINUTES">%3$d</xliff:g> min."</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Naudojimo statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Naudojimo statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Rūšiuoti pagal:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Spausdinimo paslaugos"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Siunčiant į spausdintuvą dokumentas gali būti perduodamas per kelis serverius."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nustatymai"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridėti spausdintuvų"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pridėti paslaugą"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pridėti spausdintuvą"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Paieška"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Ieškoma spausdintuvų"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Spausdinimo užduotys"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktyvios spausd. užduotys"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas naudojo akumuliatorių"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akum. naudoj. duom. nepasiek."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesų statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Entuziastų pateikta statistika apie vykstančius procesus"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Naudojama atmintis"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Tipo <xliff:g id="TYPE">%1$s</xliff:g> programos per <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Fonas"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Priekinis planas"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Išsaugota talpykloje"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Įrenginio atmintis šiuo metu yra <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Vidutinis laisvosios prieigos atminties naudojimas"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalus laisvosios prieigos atminties naudojimas"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Rodymo laikas"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Paslaugos"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Rodyti sistemos procesus"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Naudoti USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikos tipas"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fonas"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Priekinis planas"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Išsaugota talpykloje"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Balso įvestis ir išvestis"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balso paieška"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Negalima sinchronizuoti rankiniu būdu"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G nustatymai"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nustatyti ir valdyti 4G tinklą ir modemą"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
     <string name="enter_password" msgid="4131758584074246224">"Kad iššifruotumėte atmintinę, įveskite slaptažodį"</string>
     <string name="try_again" msgid="4272075051293936921">"Bandykite dar kartą."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Programų ir turinio apribojimai"</string>
     <string name="user_rename" msgid="8523499513614655279">"PERVARDYTI"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nustatykite programos apribojimus"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0c76173..9935fad 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Sākt <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konts:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Starpniekservera iestatījumi"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Starpniekserveris"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Notīrīt"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Starpniekservera ports"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Apiet starpniekserveri:"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ieslēgts"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izslēgts"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Atspējots"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifikācija"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informācija par sesiju"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Iespējot klausīšanās režīmu"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Iespējot autonomo GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pārtraukt"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Atsākt"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS konfigurācija"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Klausīšanās kanāls"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Darbības kanāls"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Pārvaldīt mob. ier. pakalp. tarifu"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilo sakaru pakalpojumu plāns"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Noklusējuma īsziņu lietotne"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vai mainīt īsziņu lietotni?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Vai izmantot lietotni <xliff:g id="NEW_APP">%s</xliff:g> kā īsziņu lietojumprogrammu pašreizējās lietotnes <xliff:g id="CURRENT_APP">%s</xliff:g> vietā?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nezināms SIM operators"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operatora %1$s nodrošināšanas vietne nav zināma."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lūdzu, ievietojiet SIM karti un restartējiet."</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režīms"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Augsta precizitāte"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumulatora jaudas taupīšana"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tikai ierīces sensori"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Atrašanās vieta izslēgta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Neseni vietu pieprasījumi"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Pēdējā laikā nevienā lietotnē nav pieprasīta atrašanās vietas informācija."</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Lietojuma statistika"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Lietojuma statistika"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Kārtot pēc:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Drukāšanas pakalpojumi"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokuments, iespējams, tiek pārsūtīts caur vienu vai vairākiem serveriem, līdz tas nonāk līdz printerim."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Iestatījumi"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pievienot printerus"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pievienot pakalpojumu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pievienot printeri"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Meklēt"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Printeru meklēšana"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Drukas darbi"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktīvie drukas darbi"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas patērējis akumulatoru"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akumul. liet. dati nav pieej."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesu statistika"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistika par darbības procesiem"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Atmiņas lietojums"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> lietotnes šādā laika posmā: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Fons"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Priekšplāns"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Saglabāts kešatmiņā"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Ierīces atmiņas līmenis pašreiz ir <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Vidējais RAM lietojums"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimālais RAM lietojums"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ilgums"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Pakalpojumi"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Rādīt sistēmas procesus"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Lietot unikālo kopas lielumu"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikas veids"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Fons"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Priekšplāns"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Saglabāts kešatmiņā"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Balss ievade un izvade"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balss ievades un izvades iestatījumi"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balss meklēšana"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nevar sinhronizēt manuāli"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Pašlaik ir atspējota šī vienuma sinhronizācija. Lai mainītu šo iestatījumu, īslaicīgi ieslēdziet fona datu lietojumu un automātisko sinhronizāciju."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G iestatījumi"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G tīkla un modema pārvaldība un iestatīšana"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ierakstiet paroli, lai atšifrētu atmiņu"</string>
     <string name="try_again" msgid="4272075051293936921">"Mēģiniet vēlreiz."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Lietotņu un satura ierobežojumi"</string>
     <string name="user_rename" msgid="8523499513614655279">"PĀRDĒVĒT"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Iestatīt lietotnes ierobežojumus"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 52df275..ab8b57f 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -133,7 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Холбогдсон"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Холбогдсон (утас байхгүй)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Холбогдсон (медиа байхгүй)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Холбогдсон (зурвас хандалтгүй)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Холбогдсон (зурвас хандалт байхгүй)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Холбогдсон (утас буюу медиа байхгүй)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Салгагдсан"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Салгаж байна…"</string>
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> эхлүүлэх"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Акаунт:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Прокси тохиргоо"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Прокси"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Цэвэрлэх"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Прокси порт"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Тойрох прокси"</string>
@@ -506,7 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файл дамжуулахад ашиглах"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Оруулахад ашиглах"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернет хандалтанд ашиглах"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Газрын зураг ашиглах"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Газрын зурагт ашиглах"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Док-н тохиргоо"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Аудиод док ашиглах"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Чанга яригч утсаар"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Идэвхтэй"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Идэвхгүй"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Идэвхгүйжүүлсэн"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертификат"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Сешн мэдээлэл"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Сонсох горимыг идэвхжүүлэх"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Автономит GO идэвжхүүлэх"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Түр зогсоох"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Үргэлжлүүлэх"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS тохируулга"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Суваг сонсох"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Сувгыг ажиллуулах"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Таблет өөр төхөөрөмжид хүрэх үед өгөгдөл солилцохыг зөвшөөрөх"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Утас өөр төхөөрөмжид хүрэх үед өгөгдөл солилцохыг зөвшөөрөх"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> модем болгохыг болиулах болно."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Тусламж"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобайл сүлжээнүүд"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Мобайл төлөвлөгөөг удирдах"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Мобайл төлбөрийн багц"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Үндсэн SMS апп"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS апп-г өөрчлөх үү?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Таны үндсэн SMS аппликешнээр <xliff:g id="CURRENT_APP">%s</xliff:g>-н оронд <xliff:g id="NEW_APP">%s</xliff:g>-г ашиглах уу?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Тодорхойгүй SIM оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-д мэдэгдэж байгаа эрх зохицуулах вебсайт байхгүй байна"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Горим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Өндөр нарийвчлалтай"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батерей хэмнэх"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Зөвхөн төхөөрөмжийг мэдрэгчид"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Байршил идэвхгүй"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Саяхны байршлын хүсэлтүүд"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Саяхан байршлын мэдээлэл хүссэн апп байхгүй"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ц <xliff:g id="MINUTES">%2$d</xliff:g>м <xliff:g id="SECONDS">%3$d</xliff:g>с"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>м <xliff:g id="SECONDS">%2$d</xliff:g>с"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>с"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>ө <xliff:g id="HOURS">%2$d</xliff:g>ц <xliff:g id="MINUTES">%3$d</xliff:g>м"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>ц <xliff:g id="MINUTES">%2$d</xliff:g>м"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>м"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Ашиглалтын статистик"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Ашиглалтын статистик"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Эрэмблэх:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Хэвлэлт"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Хэвлэх үйлчилгээнүүд"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Таны документ принтерт очтолоо нэг буюу хэд хэдэн серверээр дамжиж болно."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Үйлчилгээ суулгагдаагүй байна"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Тохиргоо"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Принтер нэмэх"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Үйлчилгээ нэмэх"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Принтер нэмэх"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Хайх"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Принтер хайж байна"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Хэвлэх ажлууд"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Идэвхтэй хэвлэх ажлууд"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Зай"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Зайны цэнэг юунд ашиглагдсан вэ"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Зайны цэнэг зарцуулалтын өгөгдөл байхгүй байна."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Процессын статус"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ажиллаж байгаа процессуудын талаарх статус"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Санах ойн ашиглалт"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> апп-ууд <xliff:g id="TIME">%2$s</xliff:g> хугацаанд"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Далд"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ил"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Кеш хийгдсэн"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Төхөөрөмжийн санах ой одоо <xliff:g id="MEMSTATE">%1$s</xliff:g> байна"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Дундаж RAM ашиглалт"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Хамгийн их RAM ашиглалт"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ажилласан хугацаа"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Үйлчилгээнүүд"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Системийг харуулах"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uss ашиглах"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Статистикийн төрөл"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Далд"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Ил"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кеш хийгдсэн"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Дуугаар оруулах &amp; гарах"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Дуугаар оруулах &amp; гарах тохиргоо"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Дуут хайлт"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Гараар синк хийх боломжгүй"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G тохиргоо"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G сүлжээ болон модемыг тохируулах &amp; удирдах"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC хаяг"</string>
     <string name="enter_password" msgid="4131758584074246224">"Сангийн шифрийг тайлахын тулд нууц үг бичнэ үү"</string>
     <string name="try_again" msgid="4272075051293936921">"Дахин оролдно уу."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Контентын акаунт"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Зургийн ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Үүрэн нэвтрүүлэг"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Харуулах яаралтай сэрэмжлүүлгийн төрлийг сонгоно уу."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Аппликешн болон контентын хязгаарлалт"</string>
     <string name="user_rename" msgid="8523499513614655279">"НЭР ӨӨРЧЛӨХ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Апп хязгаарлалт тохируулах"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index cc280eb..c6d504b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Disambungkan (tiada telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Disambungkan (tiada media)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Disambungkan (tiada akses mesej)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Disambungkan (tiada telefon atau media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Diputuskan sambungan"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutuskan sambungan..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Permintaan akses buku telefon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s mahu mengakses kenalan dan sejarah panggilan anda. Beri akses kepada %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Permintaan akses mesej"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulakan <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Akaun:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Tetapan proksi"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proksi"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Padam bersih"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Pintas proksi untuk"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Peranti input"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Mesej"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari peranti input."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Disambungkan ke peta"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak bersambung kepada pelayan pemindahan fail"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Disambungkan ke peranti input"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Sbg ke pranti utk aks Int"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk pemindahan fail"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk input"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gunakan untuk akses Internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Tetapan Dok"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Hidup"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Matikan"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dilumpuhkan"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Pensijilan"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Maklumat sesi"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Dayakan mod mendengar"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Dayakan GO autonomi"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Jeda"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Sambung semula"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfigurasi WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Saluran dengar"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Saluran operasi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Sediakan tempat liputan Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> tempat liputan Wi-Fi mudah alih"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"TitikPanasAndroid"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Urus pelan mudah alih"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Pelan mudah alih"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Apl SMS lalai"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Tukar apl SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> bukannya <xliff:g id="CURRENT_APP">%s</xliff:g> sebagai aplikasi SMS anda?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Pengendali SIM tidak dikenali"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tdk mempunyai tapak web peruntukan dikenali"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sila masukkan kad SIM dan mulakan semula"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Kejituan tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Penjimatan bateri"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Penderia peranti sahaja"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi dimatikan"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaharu"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tiada aplikasi yang telah meminta lokasi baru-baru ini"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Isih mengikut:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Perkhidmatan cetak"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumen anda mungkin melalui satu atau lebih pelayan dalam perjalanan ke pencetak."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Tetapan"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambah pencetak"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tambahkan perkhidmatan"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tambah pencetak"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Cari"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Mencari pencetak"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Kerja cetakan"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Kerja cetakan aktif"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan bateri tidak tersedia.."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistik skema tentang proses yang sedang berjalan"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apl mengikut <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Latar Belakang"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Latar Depan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Dicache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori peranti kini adalah <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Purata penggunaan RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Masa berjalan"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Perkhidmatan"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Tunjukkan sistem"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Latar Belakang"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Latar Depan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Dicache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Input &amp; output suara"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Tetapan input &amp; output suara"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Carian suara"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Tidak boleh menyegerakkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Penyegerakan untuk item ini dilumpuhkan pada masa ini. Untuk menukar tetapan ini, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Tetapan 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Menetapkan &amp; menguruskan rangkaian dan modem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Taip kata laluan untuk menyahsulit storan"</string>
     <string name="try_again" msgid="4272075051293936921">"Cuba lagi."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Dilumpuhkan"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisif"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Rangkaian mungkin dipantau"</string>
+    <string name="done_button" msgid="1991471253042622230">"Selesai"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Pemantauan rangkaian"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Peranti ini diuruskan oleh: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nPentadbir anda boleh memantau aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nUntuk maklumat lanjut, hubungi pentadbir anda."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Pihak ketiga boleh memantau aktiviti\nrangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nBukti kelayakan dipercayai yang dipasang pada peranti anda membolehkan perkara ini."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Semak bukti kelayakan dipercayai"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Tambah pengguna atau profil"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Benarkan apl dan kandungan"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikasi dengan sekatan"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Kembangkn tetapan utk aplikasi"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Nyahpasang aplikasi ini"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Sekatan aplikasi dan kandungan"</string>
     <string name="user_rename" msgid="8523499513614655279">"NAMAKAN SEMULA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Tetapkan sekatan apl"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e90308d..6b99210 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Mellomtjenerinnstillinger"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Mellomtjener"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tøm"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port for mellomtjener"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Gå forbi mellomtjener for"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktivert"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifisering"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Info om økt"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktiver lyttemodus"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktiver autonom gruppeeier"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Sett på pause"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Gjenoppta"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-konfigurasjon"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Lytt etter kanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Driftskanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrer mobilabonnement"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Standard SMS-app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du endre SMS-app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%s</xliff:g> for SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ukjent SIM-operatør"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ikke noe kjent nettsted for identitetshåndtering"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sett inn SIM-kortet og start enheten på nytt"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høy nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Bare enhetssensorer"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon deaktivert"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige stedsforespørsler"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>t <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> t <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Bruksstatistikk"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Bruksstatistikk"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorter etter:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjenester"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokumentet ditt kan bli sendt til skriveren via flere tjenere."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Innstillinger"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Legg til skrivere"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Legg til tjeneste"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Legg til skriver"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Søk"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Søker etter skrivere …"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Utskriftsjobber"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktive utskriftsjobber"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribruksdata ikke tilgj."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Prosess-statistikk"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nerdete statistikk om prosesser som er i gang"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnebruk"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apper over <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Bakgrunn"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Forgrunn"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Bufret"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhetsminnet er for tiden <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gjennomsnittlig RAM-bruk"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimal RAM-bruk"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Kjøringstid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Vis system"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Bruk Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikktype"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrunn"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Forgrunn"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Bufret"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Tale (inn/ut)"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Innstillinger for talekommando og -styring"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøk"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering for dette elementet er deaktivert. Hvis du vil endre innstillinger, kan du midlertidig slå på bakgrunnsdata og automatisk synkronisering."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-innstillinger"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurer og administrer 4G-nettverk og -modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Skriv inn passordet for å dekryptere lagring"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv på nytt."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Begrensninger for apper og innhold"</string>
     <string name="user_rename" msgid="8523499513614655279">"GI NYTT NAVN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Angi appbegrensninger"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d371e80..30de39f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxyinstellingen"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wissen"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy-poort"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proxy omzeilen voor"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Uit"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Uitgeschakeld"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificering"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Sessiegegevens"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Luistermodus inschakelen"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Autonome GO inschakelen"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Onderbreken"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Hervatten"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-configuratie"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Luisterkanaal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operationeel kanaal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobiel abonnement beheren"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiel abonnement"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Standaard sms-app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Sms-app wijzigen?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Wilt u <xliff:g id="NEW_APP">%s</xliff:g> als uw sms-app gebruiken in plaats van <xliff:g id="CURRENT_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende simprovider"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s heeft geen bekende website voor provisioning"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Plaats een simkaart en start het apparaat opnieuw"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Grote nauwkeurigheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Alleen apparaatsensoren"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locatie uit"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recente locatieverzoeken"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Er zijn geen apps die uw locatie onlangs hebben aangevraagd"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>u <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> u <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> u <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Gebruiksstatistieken"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Gebruiksstatistieken"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sorteren op:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Afdrukservices"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Uw document kan via een of meer servers naar de printer worden verzonden."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellingen"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printers toevoegen"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Service toevoegen"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Printer toevoegen"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Zoeken"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Printers zoeken"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Afdruktaken"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Actieve afdruktaken"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Accugebruikgegevens niet beschikbaar."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistieken"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistieken voor nerds over actieve processen"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Geheugengebruik"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps voor <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Achtergrond"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Voorgrond"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"In cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Apparaatgeheugen is momenteel <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Gemiddeld RAM-gebruik"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximaal RAM-gebruik"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Uitvoeringstijd"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektype"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Achtergrond"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Voorgrond"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"In cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Spraakinvoer en -uitvoer"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Instellingen voor spraakinvoer en -uitvoer"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Spraakgestuurd zoeken"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als u deze instelling wilt wijzigen, schakelt u achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-instellingen"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G-netwerk en modem instellen en beheren"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Typ een wachtwoord om de opslag te decoderen"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer het opnieuw."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecteer de typen noodoproepen die moeten worden weergegeven."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Beperkingen voor apps en inhoud"</string>
     <string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-beperkingen instellen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2f3e0a9..49171d9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Rozpocznij <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Ustawienia proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Sewer proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Wyczyść"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Numer portu serwera proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Pomiń proxy dla"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Wł."</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Wył."</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Wyłączona"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certyfikacja"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informacje o sesji"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Włącz tryb słuchania"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Włącz autonomicznego GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Wstrzymaj"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Wznów"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfiguracja WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanał słuchania"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Kanał obsługi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Zarządzaj abonamentem komórkowym"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Taryfa komórkowa"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Domyślna aplikacja do SMS-ów"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmienić aplikację do SMS-ów?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Użyć <xliff:g id="NEW_APP">%s</xliff:g> zamiast <xliff:g id="CURRENT_APP">%s</xliff:g> jako aplikacji do SMS-ów?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nieznany operator karty SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nie ma znanej witryny obsługi"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tylko czujniki urządzenia"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Obsługa lokalizacji wyłączona"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Ostatnie prośby o lokalizację"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Żadne aplikacje nie poprosiły ostatnio o lokalizację"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>g <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> godz. <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> godz. <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statystyki użycia"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statystyki użycia"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortuj wg:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Usługi drukowania"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Zanim dokument dotrze do drukarki, może przejść przez jeden lub kilka serwerów."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ustawienia"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj drukarki"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj usługę"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj drukarkę"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Szukaj"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Szukanie drukarek"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Zadania drukowania"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktywne zadania drukowania"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Brak danych o zużyciu baterii"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Użycie pamięci"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikacje <xliff:g id="TYPE">%1$s</xliff:g> przez <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"w tle"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"na pierwszym planie"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"w pamięci podręcznej"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktualny stan pamięci: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Średnie użycie pamięci RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksymalne użycie pamięci RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Czas pracy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usługi"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Użyj USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statystyk"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Tło"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Pierwszy plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Pamięć podręczna"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ustawienia głosowe"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ustawienia funkcji głosowych"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Wyszukiwanie głosowe"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nie można zsynchronizować ręcznie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Ustawienia 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfiguruj sieć i modem 4G oraz zarządzaj nimi"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Wpisz hasło, aby odszyfrować pamięć masową."</string>
     <string name="try_again" msgid="4272075051293936921">"Spróbuj ponownie."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisje komórkowe"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wybierz typy alertów o zagrożeniu, które chcesz wyświetlić."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Ograniczenia aplikacji i zawartości"</string>
     <string name="user_rename" msgid="8523499513614655279">"ZMIEŃ NAZWĘ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ustaw ograniczenia aplikacji"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0bee92b..dda5e09 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Conta:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Definições de proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ignorar proxy para"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificação"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informação da sessão"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Ativar modo de audição"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Ativar PG autónomo"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Interromper"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Retomar"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuração WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Ouvir canal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal operativo"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gerir tarifário de telemóvel"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de telemóvel"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicação de SMS predefinida"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicação de SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%s</xliff:g> como a aplicação de SMS predefinida?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de cartão SIM desconhecido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"A %1$s não possui um Website de gestão conhecido"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Poupança de bateria"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Apenas sensores do dispositivo"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localização desativada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pedidos de localização recentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhuma aplicação solicitou a localização recentemente"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de utilização"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de utilização"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordenar por:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Imprimir"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"O seu documento pode passar por um ou mais servidores no seu caminho para a impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Definições"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adicionar serviço"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adicionar impressora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Pesquisar"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"A procurar impressoras"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tarefas de impressão"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Tarefas de impr. ativas"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados utiliz. bater. não disp."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas do Processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas de peritos acerca dos processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilização da memória"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplicações durante <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Em segundo plano"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Em primeiro plano"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Em cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo é de <xliff:g id="MEMSTATE">%1$s</xliff:g> atualmente"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilização média da RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilização máxima da RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Utilizar Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Em segundo plano"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Em primeiro plano"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Em cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Definições de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa de voz"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização deste item está atualmente desativada. Para alterar esta definição, ative temporariamente os dados de segundo plano e a sincronização automática."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Definições de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar e gerir modem e rede 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduzir palavra-passe para desencriptar armazenamento"</string>
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões celulares"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a apresentar."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições à aplicação e conteúdo"</string>
     <string name="user_rename" msgid="8523499513614655279">"MUDAR NOME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições da aplicação"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8c18322..50377fc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sem acesso a mensagens)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitação de conexão Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toque para conectar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Deseja conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitação de acesso à agenda telefônica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s deseja acessar seus contatos e o histórico de chamadas. Conceder acesso a %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitação de acesso a mensagens"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Conta:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Configurações de proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Limpar"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Porta do proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitar proxy para"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio da mídia."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do áudio do viva-voz."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desconectado do dispositivo de entrada."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configurações de dock"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Usar dock para áudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificação"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informações da sessão"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Ativar modo de detecção"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Ativar GO autônomo"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pausar"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Retomar"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuração de WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Detectar canal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal de operação"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Ponto de acesso Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gerenciar plano de celular"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicativo de SMS padrão"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicativo de SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%s</xliff:g> como aplicativo de SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operadora do SIM desconhecida"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s sem website de aprovisionamento conhecido"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Só sensores do dispositivo"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Local desativado"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicit. de localiz. recentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum aplicativo solicitou a localização recentemente"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Estatísticas de uso"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estatísticas de uso"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Classificar por:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Seu documento pode passar por um ou mais servidores até chegar à impressora."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Configurações"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adicionar serviço"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adicionar impressora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Pesquisar"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Procurando impressoras"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Trabalhos de impressão"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Trab. de impressão ativos"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas de processo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas detalhadas sobre os processos em execução"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memória"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> aplicativos em <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Segundo plano"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Primeiro plano"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Em cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo está <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Uso médio de RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Segundo plano"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Primeiro plano"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Em cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configurações de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa por voz"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Configurações de 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configure e gerencie a rede e o modem 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digite a senha para descriptografar o armazenamento"</string>
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
@@ -2017,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicativos e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicativos com restrições"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. p/ aplicativo"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Desinstalar o aplicativo"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
@@ -2036,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições de aplic. e conteúdo"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições do aplicativo"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d12d8f4..c8dce7f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -250,7 +250,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Iniziar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Conto:"</string>
-    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
     <skip />
     <string name="proxy_clear_text" msgid="5555400754952012657">"Stizzar"</string>
     <!-- no translation found for proxy_port_label (5655276502233453400) -->
@@ -789,24 +789,6 @@
     <skip />
     <!-- no translation found for wifi_display_summary_disabled (5318394806146587849) -->
     <skip />
-    <!-- no translation found for wifi_display_certification_heading (3125105883233765652) -->
-    <skip />
-    <!-- no translation found for wifi_display_session_info (4733627902691604836) -->
-    <skip />
-    <!-- no translation found for wifi_display_listen_mode (2962301785910874273) -->
-    <skip />
-    <!-- no translation found for wifi_display_autonomous_go (140864379216673466) -->
-    <skip />
-    <!-- no translation found for wifi_display_pause (6037110530682927245) -->
-    <skip />
-    <!-- no translation found for wifi_display_resume (8195590160258469425) -->
-    <skip />
-    <!-- no translation found for wifi_display_wps_config (7566565571340705772) -->
-    <skip />
-    <!-- no translation found for wifi_display_listen_channel (4146320990898147857) -->
-    <skip />
-    <!-- no translation found for wifi_display_operating_channel (233535284689144515) -->
-    <skip />
     <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
     <skip />
     <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
@@ -1536,7 +1518,13 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vegn deconnectà dal tethering."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Agid"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Raits mobilas"</string>
-    <!-- no translation found for manage_mobile_plan_title (7588182101738043593) -->
+    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
+    <skip />
+    <!-- no translation found for sms_application_title (6134351177937015839) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
+    <skip />
+    <!-- no translation found for sms_change_default_dialog_text (8183679628429465443) -->
     <skip />
     <!-- no translation found for mobile_unknown_sim_operator (9101230468757324260) -->
     <skip />
@@ -1553,7 +1541,7 @@
     <skip />
     <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
     <skip />
-    <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
     <skip />
     <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
     <skip />
@@ -2791,9 +2779,7 @@
     <skip />
     <!-- no translation found for cant_sync_dialog_message (1938380442159016449) -->
     <skip />
-    <!-- no translation found for wimax_settings (1574837328738396794) -->
-    <skip />
-    <!-- no translation found for wimax_settings_summary (3207355006084135453) -->
+    <!-- no translation found for wimax_settings (2655139497028469039) -->
     <skip />
     <!-- no translation found for status_wimax_mac_address (8390791848661413416) -->
     <skip />
@@ -3302,8 +3288,6 @@
     <skip />
     <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
     <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
     <!-- no translation found for user_restrictions_title (7745810037152772035) -->
     <skip />
     <!-- no translation found for user_rename (8523499513614655279) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e8f459d..8c00e6f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conţ. media)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectat (fără acces la mesaje)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără tel. sau conţ. media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitare de conectare Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Atingeţi pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriţi să vă conectaţi la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Solicitarea accesului la agendă"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. şi istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nu doresc să fiu întrebat(ă) din nou"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitarea accesului la mesaje"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setări privind data şi ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectaţi fusul orar"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Porniţi <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cont:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Setări proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Ștergeţi"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitaţi utilizarea unui proxy pentru"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispozitiv de intrare"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acces internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la media audio."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la componenta audio handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat de la dispozitivul de intrare."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conţinut media audio"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fişiere"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectat la hartă"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la disp. pt. acces internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizaţi pentru transferul de fişiere"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizaţi pentru introducere date"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizaţi pentru acces internet"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizați pentru hartă"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Setări de andocare"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilizaţi dispozitivul de andocare pentru componenta audio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Pornit"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Oprit"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dezactivat"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certificare"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informații despre sesiune"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Activați modul ascultare"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Activați GO autonome"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Întrerupeți"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Reluați"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configurare WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Canal pentru ascultare"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Canal operativ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permiteţi schimbul de date atunci când tableta atinge alt dispozitiv"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurați hotspotul Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Hotspot Wi-Fi portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestionați planul de date mobile"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan de date mobile"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Aplicație SMS prestabilită"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Schimbați aplicația SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Utilizați <xliff:g id="NEW_APP">%s</xliff:g> în loc de <xliff:g id="CURRENT_APP">%s</xliff:g> ca aplicație SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator de SIM necunoscut"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Niciun site de provizionare cunoscut pentru %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Numai senzorii dispozitivului"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locație dezactivată"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitări recente de localiz."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
@@ -1379,12 +1367,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> sec."</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>z <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistici de utilizare"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistici de utilizare"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortaţi după:"</string>
@@ -1451,8 +1436,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Printare"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Servicii de imprimare"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Documentul poate trece prin unul sau mai multe servere pe calea spre imprimantă."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Setări"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adăugați imprimante"</string>
@@ -1461,12 +1445,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adăugați un serviciu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adăugați o imprimantă"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Căutați"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Se caută imprimante"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Sarcini de printare"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Sarcini active de printare"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ce funcţii au utilizat bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Date utilizare baterie nedisp."</string>
@@ -1546,33 +1527,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistici de proces"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistici inteligente despre procesele care rulează"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Utilizarea memoriei"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicații de tip <xliff:g id="TYPE">%1$s</xliff:g> în <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"În fundal"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"În prim-plan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"În cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memoria dispozitivului este în prezent <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Utilizare medie RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizare maximă RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durată de rulare"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicii"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Afișați sistemul"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Utilizați Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipul de statistici"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"În fundal"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"În prim-plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"În cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Intrare şi ieşire voce"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare şi de ieşire a vocii"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Căutare vocală"</string>
@@ -1780,8 +1749,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Sincronizarea manuală nu este posibilă"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba această setare, activaţi temporar datele de fundal şi sincronizarea automată."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Setări 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Configuraţi şi gestionaţi reţeaua 4G şi modemul"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduceţi parola pentru a decripta stocarea"</string>
     <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
@@ -1967,18 +1935,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Dezactivat"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Facultativ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Rețeaua poate fi monitorizată"</string>
+    <string name="done_button" msgid="1991471253042622230">"Terminat"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorizarea rețelei"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Acest dispozitiv este gestionat de: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nAdministratorul poate să monitorizeze activitatea dvs. în rețea, inclusiv mesajele de e-mail, aplicațiile și site-urile securizate.\n\nPentru mai multe informații, contactați administratorul."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"O terță parte poate monitoriza activitatea dvs. în\nrețea, inclusiv mesajele de e-mail, aplicațiile și site-urile securizate.\n\nAcest lucru este posibil deoarece există o acreditare de încredere instalată pe dispozitivul dvs."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verificați acreditările de încredere"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Adăugați un utilizator/un profil"</string>
@@ -2024,8 +1986,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Permiteți aplicații și conținut"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicații cu restricții"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Extindeți setările aplicației"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Dezinstalați această aplicație"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
@@ -2043,7 +2004,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conţinut"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Restricții aplicații și conținut"</string>
     <string name="user_rename" msgid="8523499513614655279">"REDENUMIȚI"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Setați restricțiile aplicației"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ca1db76..5a65f40 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Подключено (кроме HSP/HFP)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Подключено (кроме A2DP)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Подключено (нет доступа к сообщениям)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Подключено (кроме HSP/HFP/A2DP)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запрос на подключение по каналу Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Нажмите, чтобы подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Запрос на доступ к списку контактов"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Устройство \"%1$s\" пытается получить доступ к вашим контактам и журналу вызовов. Разрешить доступ для %2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Больше не спрашивать"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больше не спрашивать"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Запрос на доступ к сообщениям"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Начать <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Аккаунт:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Настройки прокси-сервера"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Прокси-сервер"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистить"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт прокси-сервера"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Не использовать прокси-сервер для:"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Профиль HID"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернет-доступ"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ к сообщениям"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от источника звука."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено от гарнитуры."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> отключается от устройства ввода."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Доступ к сообщениям"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Подключено к устройству ввода"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Используется интернет-подключение другого устройства"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Использовать для ввода"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Использовать для доступа к Интернету"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Использовать для доступа к сообщениям"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Настройки док-станции"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Использовать док-станцию для звука"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Включен"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выключен"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Отключен"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертификация"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Данные о сеансе"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Включить режим прослушивания"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Независимые владельцы групп"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Приостановить"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Включить"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Настроить WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Аудиоканал"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Рабочий канал"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешить обмен данными при совмещении планшета с другим устройством"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка точки доступа Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Портативная точка доступа Wi-Fi: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Хот-спот Android"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Общие"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Управление тарифным планом"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифный план"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Приложение для обмена SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Смена приложения для обмена SMS"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Использовать приложение \"<xliff:g id="NEW_APP">%s</xliff:g>\", а не \"<xliff:g id="CURRENT_APP">%s</xliff:g>\" для обмена SMS-сообщениями?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестный оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"У оператора \"%1$s\" нет веб-сайта для синхронизации"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставьте SIM-карту и перезагрузите устройство"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Высокая точность"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Сокращение энергопотребления"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Только сенсоры устройства"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Отправка геоданных отключена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последние запросы места"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"В последнее время приложения не запрашивали геоданные"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> м. <xliff:g id="SECONDS">%3$d</xliff:g> с."</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> м. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> с."</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> дн. <xliff:g id="HOURS">%2$d</xliff:g> ч. <xliff:g id="MINUTES">%3$d</xliff:g> мин."</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Статистика использования"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика использования"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Упорядочить по:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Печать"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Службы печати"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Путь вашего документа до принтера может проходить через несколько серверов."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавить принтеры"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Добавить службу печати"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Добавить принтер"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Поиск"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Поиск принтеров"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Задания печати"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Активные задания печати"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На что расходуется заряд батареи"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Расход батареи неизвестен."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процессов"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Статистика запущенных процессов"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Использование памяти"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> приложения за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Фоновые"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Активные"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Кешированные"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Уровень свободной памяти: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Использование оперативной памяти (среднее значение)"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Использование оперативной памяти (максимальное значение)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Время работы"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Сервисы"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Системные процессы"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Использовать USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистических данных"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фоновые процессы"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Активные процессы"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кешированные процессы"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Голосовой ввод и вывод"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки голосового ввода и вывода"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Голосовой поиск"</string>
@@ -1699,7 +1668,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Удаленное управление Android"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Активировать"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор устройства"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Активация этого администратора позволит приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" выполнять следующие операции:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" сможет выполнять следующие операции:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Администратор активирован и разрешает приложению <xliff:g id="APP_NAME">%1$s</xliff:g> выполнять следующие операции:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Без названия"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Общие"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не удалось синхронизировать данные"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизация отключена. Чтобы включить ее, временно разрешите передачу данных в фоновом режиме и автоматическую синхронизацию."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Настройки 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Подключение и настройка сети и модема 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введите пароль для расшифровки данных хранилища"</string>
     <string name="try_again" msgid="4272075051293936921">"Повторите попытку."</string>
@@ -1968,18 +1936,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Отключено"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Действия в сети могут отслеживаться"</string>
+    <string name="done_button" msgid="1991471253042622230">"Готово"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Мониторинг сети"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Устройством управляет администратор домена <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nОн может отслеживать ваши действия в сети, в том числе просматривать письма, приложения и список посещенных веб-сайтов.\n\nЗа дополнительной информацией обратитесь к администратору."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Администратор может отслеживать ваши действия в сети.\nНапример, он может просматривать ваши письма, приложения и список посещенных сайтов.\n\nЭто возможно благодаря надежному сертификату, установленному на устройстве."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Настройки сертификатов"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Добавить пользователя/профиль"</string>
@@ -2025,8 +1987,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Удалить приложение"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
@@ -2044,7 +2005,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Оповещение населения"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Укажите, какие оповещения вы хотите получать"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Ограничения для приложения и контента"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРЕИМЕНОВАТЬ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Настроить ограничения"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2b51efe..362a23a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Pripojené (bez telefónu)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Pripojené (bez média)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Pripojené (bez prístupu ku správam)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Pripojené (bez telefónu alebo média)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prebieha odpájanie..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Žiadosť o pripojenie zariadenia Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"K zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ sa pripojíte dotykom."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete sa pripojiť k zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Žiadosť o prístup k telefónnemu zoznamu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zariadenie %1$s žiada o prístup k vašim kontaktom a histórii hovorov. Povoliť zariadeniu %2$s prístup?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nabudúce sa nepýtať"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nabudúce sa nepýtať"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Žiadosť o prístup ku správam"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavenia dátumu a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Spustiť <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Účet:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavenia servera proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Server proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Vymazať"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy:"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Nepoužívať server proxy pre"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupné zariadenie"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prístup na Internet"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prístup ku správam"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"Profil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojený od vstupného zariadenia."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Pripojené k mape"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepripojené k serveru pre prenos súborov"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Pripojené na vstupné zariadenie"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pripoj. k zariad. s príst. na Internet"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použiť na prenos súborov"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použiť pre vstup"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použiť na prístup k Internetu"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použiť pre mapu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Nastavenia doku"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Použiť zvuk doku"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certifikácia"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Informácie o relácii"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Povoliť režim počúvania"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Povoliť autonómneho vlastníka skupiny"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pozastaviť"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Obnoviť"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfigurácia WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanál na počúvanie"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Operačný kanál"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot siete Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Prenosný hotspot siete Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Správa mobilného plánu"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilný plán"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Predvolená aplikácia SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmeniť aplikáciu SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> namiesto aplikácie <xliff:g id="CURRENT_APP">%s</xliff:g> ako aplikáciu SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámy operátor karty SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žiadne provízne webové stránky"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte kartu SIM a reštartujte"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká presnosť"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Šetrenie batérie"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Len senzory zariadenia"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Poloha je vypnutá"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávne žiadosti o polohu"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d. <xliff:g id="HOURS">%2$d</xliff:g> hod. <xliff:g id="MINUTES">%3$d</xliff:g> min."</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> hod. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Štatistiky používania"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Štatistiky používania"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Zoradiť podľa:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tlačové služby"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Skôr ako sa váš dokument dostane do tlačiarne, môže prejsť jedným alebo viacerými servermi."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavenia"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridať tlačiarne"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pridať službu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pridať tlačiareň"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Hľadať"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Vyhľadávanie tlačiarní"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Tlačové úlohy"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktívne tlačové úlohy"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Čo využíva batériu"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotrebe nie sú k dispozícii."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Štatistiky procesov"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné štatistiky spustených procesov"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplikácie typu <xliff:g id="TYPE">%1$s</xliff:g> za obdobie <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Pozadie"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Popredie"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"V pamäti"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuálny stav pamäte zariadenia: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Priemerné využitie pamäte RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximálne využitie pamäte RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Spustené"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Zobraziť systém"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Použiť Uss (jedinečnú veľkosť súpravy)"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ štatistík"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Pozadie"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Popredie"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"V pamäti"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Hlasový vstup a výstup"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavenia hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhľadávanie"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite prenos údajov na pozadí a automatickú synchronizáciu."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavenia 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastaviť a spravovať sieť 4G a modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ak chcete dešifrovať ukladací priestor, zadajte heslo"</string>
     <string name="try_again" msgid="4272075051293936921">"Skúsiť znova."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázané"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Mierne"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Sieť môže byť monitorovaná"</string>
+    <string name="done_button" msgid="1991471253042622230">"Hotovo"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Monitorovanie siete"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Toto zariadenie spravuje: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nVáš správca môže monitorovať vašu aktivitu v sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok.\n\nAk chcete získať viac informácií, obráťte sa na svojho správcu."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Tretia strana môže monitorovať vašu aktivitu\nv sieti vrátane e-mailov, aplikácií a zabezpečených webových stránok.\n\nUmožňuje to dôveryhodné poverenie nainštalované vo vašom zariadení."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Skontrolovať dôveryhodné poverenia"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Pridať používateľa alebo profil"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Rozbaliť nastavenia aplikácie"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Odinštalovať túto aplikáciu"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasielanie správ v rámci bunky"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy tiesňových upozornení, ktoré sa majú zobraziť."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Obmedzenia aplikácií a obsahu"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREMENOVAŤ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastaviť obmedzenia aplikácií"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 674a48a..e09d47b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Začni <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Račun:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Nastavitve strežnika proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Strežnik proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Počisti"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Vrata strežnika proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Obidi strežnik proxy pri"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vklopljeno"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izklopljeno"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogočeno"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Potrdilo"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Podatki o seji"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Omogoči način poslušanja"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Omogoči samostojni GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Začasno ustavi"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Nadaljuj"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Konfiguracija za WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Poslušalni kanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Delovni kanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Upravljanje paketa prenosa podatkov"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Naročniški paket za mobilno napravo"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Privzeta aplikacija za SMS-e"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ali želite zamenjati aplikacijo za SMS-e?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Ali želite za SMS-e uporabljati aplikacijo <xliff:g id="NEW_APP">%s</xliff:g> namesto aplikacije <xliff:g id="CURRENT_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznani operater za SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nima znanega spletnega mesta za omogočanje uporabe"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vstavite SIM in znova zaženite"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo senzorji naprave"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokacija je izklopljena"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavne zahteve za lokacijo"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika uporabe"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika uporabe"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Razvrsti po:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Tiskalne storitve"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokument gre lahko na poti do tiskalnika skozi enega ali več strežnikov."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavitve"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodajanje tiskalnikov"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj storitev"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodajanje tiskalnika"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Iskanje"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Iskanje tiskalnikov"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Zahteve za tiskanje"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktivne zahteve za tiskanje"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kaj porablja energijo baterije"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podatki o porabi baterije niso na voljo."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistični podatki o procesih"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Statistični podatki o procesih, ki se izvajajo"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Poraba pomnilnika"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Vrsta aplikacij: <xliff:g id="TYPE">%1$s</xliff:g> – časovno obdobje: <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"V ozadju"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"V ospredju"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Predpomnjeni"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Trenutno stanje pomnilnika naprave: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Povprečna uporaba RAM-a"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Največja uporaba RAM-a"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Trajanje izvajanja"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Storitve"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uporaba USS-ja"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističnih podatkov"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"V ozadju"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"V ospredju"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Predpomnjeni"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Glasovni vnos in izhod"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavitve glasovnega vnosa in izhoda"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno iskanje"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ročna sinhronizacija ni mogoča"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Nastavitve za 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Nastavitev in upravljanje omrežja 4G in modema"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Vnesite geslo za dešifriranje shrambe"</string>
     <string name="try_again" msgid="4272075051293936921">"Poskusite znova."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Omejitve za aplikacije in vsebino"</string>
     <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Nastavitev omejitev za aplikacijo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0ad1a6e..db75fbd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Покрени <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Налог:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Подешавања за прокси"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Прокси"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Обриши"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Прокси порт"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Прокси се заобилази за"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укључен"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Искључен"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Онемогућен"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертификација"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Информације о сесији"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Омогући режим слушања"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Омогући аутономног власника групе"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Паузирај"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Настави"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS конфигурација"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Канал за слушање"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Оперативни канал"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Омогућавање размене података када таблет додирне други уређај"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Омогућавање размене података када телефон додирне други уређај"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Интернет веза са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити прекинута."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помоћ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилне мреже"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Управљање тарифним пакетом"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифни пакет за мобилни уређај"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Подразумевана апликација за SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Желите ли да промените апликацију за SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Желите ли да користите <xliff:g id="NEW_APP">%s</xliff:g> уместо <xliff:g id="CURRENT_APP">%s</xliff:g> као подразумевану апликацију за SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Непознати SIM оператер"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s нема познатих веб-сајтова за доделу"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Убаците SIM картицу и поново покрените"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Велика прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Уштеда батерије"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензори за уређаје"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Локација је искључена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Недавни захтеви за локацију"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ниједна апликација није скоро тражила локацију"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>с, <xliff:g id="MINUTES">%2$d</xliff:g>мин, <xliff:g id="SECONDS">%3$d</xliff:g>сек"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>мин, <xliff:g id="SECONDS">%2$d</xliff:g>сек"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> д <xliff:g id="HOURS">%2$d</xliff:g> с <xliff:g id="MINUTES">%3$d</xliff:g> мин"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> с <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Статистика коришћења"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика коришћења"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сортирај према:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Штампање"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуге штампања"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Документ може да прође кроз један или више сервера на путу до штампача."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Подешавања"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додај штампаче"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додај услугу"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Додај штампач"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Претражи"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Претрага штампача"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Задаци за штампање"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Активни задаци за штампу"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Шта користи батерију"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Нема података о кориш. батерије"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процеса"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Штреберска статистика о активним процесима"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Искоришћеност меморије"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Апликације типа <xliff:g id="TYPE">%1$s</xliff:g> у периоду од <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"У позадини"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"У првом плану"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Кеширано"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Меморија уређаја је тренутно <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Просечно коришћење RAM-а"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално коришћење RAM-а"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Трајање"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуге"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Прикажи систем"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Користи јединствену величину скупа"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистичких података"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"У позадини"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"У првом плану"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кеширано"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Гласовни унос и излаз"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Подешавања гласовног уноса и излаза"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Гласовна претрага"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ручно синхронизовање није могуће"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили ово подешавање, привремено укључите позадинске податке и аутоматску синхронизацију."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Подешавања за 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Подешавање и управљање 4G мрежом и модемом"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Унесите лозинку да бисте дешифровали меморију"</string>
     <string name="try_again" msgid="4272075051293936921">"Покушајте поново."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Ограничења апликација и садржаја"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУЈ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Подеси ограничења за апликацију"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 36c21a3..767330b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ansluten (ingen telefon)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ansluten (inga media)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ansluten (ingen meddelandeåtkomst)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ansluten (ingen telefon och inga media)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kopplar ifrån…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Begäran om Bluetooth-anslutning"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Tryck om du vill ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vill du ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Begäran om åtkomst till telefonbok"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s vill ha åtkomst till dina kontakter och din samtalshistorik. Vill du ge %2$s åtkomst?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Fråga inte igen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Fråga inte igen"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Begäran om meddelandeåtkomst"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Starta <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Konto:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy-inställningar"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Rensa"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxyport"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Förbigå proxy för"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Indataenhet"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetåtkomst"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meddelandeåtkomst"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån medialjud."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån handsfree."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas ifrån indataenheten."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ansluten till MAP"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ansluten till indataenhet"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ansluten för Internetåtkomst"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Använd för inmatning"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Använd för Internetåtkomst"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Använd för MAP"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dockningsinställningar"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Använd dockningsstation för ljud"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inaktiverat"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certifiering"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Sessionsinformation"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Aktivera lyssnarläge"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Aktivera autonom gruppägare"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Pausa"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Återuppta"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS-konfiguration"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Lyssnarkanal"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Driftskanal"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera trådlös surfzon via Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Mobil Wi‑Fi-surfzon med <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Hantera mobilplan"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilplan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Standardapp för sms"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vill du byta sms-app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som sms-app i stället för <xliff:g id="CURRENT_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Okänd SIM-operatör"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ingen känd administrationswebbplats"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"För in SIM-kortet och starta om"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög exakthet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparfunktion"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Endast enhetssensorer"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Plats av"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Inga appar har begärt uppgifter om plats nyligen"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Användningsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Användningsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortera efter"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjänster"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"På vägen till skrivaren kan dokumentet passera via en eller flera servrar."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Inställningar"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lägg till skrivare"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Lägg till tjänst"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Lägg till skrivare"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Sök"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Söker efter skrivare"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Utskriftsjobb"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktiva utskriftsjobb"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteriinfo ej tillgänglig."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistik"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nördig statistik om processer som körs"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Minnesanvändning"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>-appar under <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Bakgrundsprocesser"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Förgrundsprocesser"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Cachade processer"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Mängden tillgängligt minne på enheten är för närvarande <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Genomsnittlig RAM-användning"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximal RAM-användning"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Speltid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjänster"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Visa system"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Använd USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Bakgrundsprocesser"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Förgrundsprocesser"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cachade processer"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Röstindata och -utdata"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Inställningar för röstindata och -utdata"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Röstsökning"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G-inställningar"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Konfigurera och hantera 4G-nätverk och modem"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ange lösenord om du vill dekryptera lagringen"</string>
     <string name="try_again" msgid="4272075051293936921">"Försök igen."</string>
@@ -2017,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Tillåt appar och innehåll"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Appar med begränsningar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Utöka appens inställningar"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Avinstallera den här appen"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
@@ -2036,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Välj vilka typer av varningsmeddelanden som ska visas."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Begränsa appar och innehåll"</string>
     <string name="user_rename" msgid="8523499513614655279">"BYT NAMN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Konfigurera appbegränsningar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3091c3e..fe4590c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -184,7 +184,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Anzisha <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Akaunti:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Mipangilio ya seva mbadala"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Seva mbadala"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Futa"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Poti ya proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proksi ya Bypass ya"</string>
@@ -337,7 +337,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali ingiza chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna PIN ya kufunga skrini au nenosiri"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN ya kufunga skrini au nenosiri kabla kuanza usimbaji fiche."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla kuanza usimbaji fiche."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Simba?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
@@ -488,7 +488,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Imeunganishwa kwa ramani"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Imeunganishwa kwenye ramani"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Haijaunganishwa kwenye seva ya kuhamisha faili"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Umeunganishwa kwa kifaa cha kuingiza"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Umeunganishwa kwa kifaa cha ufikia Mtandao"</string>
@@ -526,15 +526,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Imewashwa"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Imezimwa"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Imelemazwa"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Uthibitishaji"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Maelezo ya kipindi"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Washa hali ya kusikiliza"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Washa GO huru"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Sitisha"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Endelea"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Usanidi wa WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kituo cha kusikiliza"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Kituo cha uendeshaji"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Ruhusu ubadilishanaji wa data wakati kompyuta kibao inagusa kifaa kingine"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
@@ -990,7 +981,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Dhibiti mpango wa simu ya mkononi"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mpango wa vifaa vya mkononi"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Programu chaguo-msingi ya SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ungependa kubadilisha programu ya SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%s</xliff:g> kama programu yako ya SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ishara maalum ya utagutaji ya SIM isiyojulikana"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
@@ -1001,7 +995,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Sensa ya vifaa pekee"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Eneo limezimwa"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya kutambua eneo"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyotaka kutambua eneo hivi karibuni"</string>
@@ -1014,7 +1009,7 @@
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Tumia GPS kutambua eneo lako"</string>
     <string name="location_loading_injected_setting" msgid="4238574500081976654">"Inarejesha…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kukadiria mahali ili kukadiria mahali ulipo kwa haraka. Data ya mahali pasipojulikana itakusanywa na kutumwa kwa Google."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Setileti za GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ruhusu programu zitumie GPS kwenye kompyuta yako kibao ili kutambua mahali ulipo"</string>
@@ -1365,12 +1360,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"s<xliff:g id="HOURS">%1$d</xliff:g> d<xliff:g id="MINUTES">%2$d</xliff:g> s<xliff:g id="SECONDS">%3$d</xliff:g>"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"d <xliff:g id="MINUTES">%1$d</xliff:g> s <xliff:g id="SECONDS">%2$d</xliff:g>"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"s<xliff:g id="SECONDS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"Siku<xliff:g id="DAYS">%1$d</xliff:g> saa <xliff:g id="HOURS">%2$d</xliff:g> dakika <xliff:g id="MINUTES">%3$d</xliff:g>"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"Saa <xliff:g id="HOURS">%1$d</xliff:g> dakika <xliff:g id="MINUTES">%2$d</xliff:g>"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"Dakika <xliff:g id="MINUTES">%1$d</xliff:g>"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Takwimu za utumiaji"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Takwimu za utumiaji"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Panga kwa:"</string>
@@ -1437,8 +1429,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Huduma za uchapishaji"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Je, ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Hati yako inaweza kupita kwenye seva moja au zaidi ikielekea kwenye printa."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mipangilio"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ongeza printa"</string>
@@ -1447,12 +1438,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ongeza huduma"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ongeza printa"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Utafutaji"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Inatafuta printa"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Kazi za kuchapisha"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Kazi zinazochapishwa"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data ya matumizi ya betri haipatikani."</string>
@@ -1532,33 +1520,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Takwimu za Mchakato"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Takwimu za kitaalamu kuhusu michakato inayoendeshwa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Kumbukumbu iliyotumika"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> programu imepita <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Ikifanya kazi chinichini"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ikifanya kazi waziwazi"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Iliyowekwa kwenye akiba"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Kumbukumbu ya kifaa kwa sasa <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Matumizi wastani ya RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Upeo wa matumizi ya RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Muda wa kuendesha"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Huduma"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Onyesha mfumo"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Tumia USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Aina ya takwimu"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ikifanya kazi chinichini"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Ikifanya kazi waziwazi"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Iliyowekwa kwenye akiba"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Kiingizaji cha sauti &amp; kutoa nje"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kiingizaji cha sauti &amp; mipangilio ya kutoa nje"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tafuta kwa kutamka"</string>
@@ -1657,7 +1633,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya stakabadhi imefutwa"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kufunga skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla ya kutumia hifadhi ya hati za uthibitisho."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
@@ -1683,10 +1659,10 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Zima"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Wasimamizi wa kifaa"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Hakuna wasimamizi kifaa wanaopatikana"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Ungependa kuwasha usimamizi wa kifaa?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Kisimamizi cha kifaa kiwashwe?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Uamilishaji wa msimamizi itaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya  uendeshi unaofuata:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Hakuna Kichwa"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
@@ -1766,8 +1742,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Mipangilio ya 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Weka na udhibiti;i modem ya mtandao wa 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ingiza nenosiri ili kusimbua hifadhi"</string>
     <string name="try_again" msgid="4272075051293936921">"Jaribu tena."</string>
@@ -2022,7 +1997,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Matangazo ya simu"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chagua aina ya arifa za dharura za kuonyesha."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Vizuizi vya programu na maudhui"</string>
     <string name="user_rename" msgid="8523499513614655279">"BADILISHA JINA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Weka vizuizi vya programu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 51f0562..dc221f8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"เริ่มต้น <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"บัญชี:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"การตั้งค่าพร็อกซี"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"พร็อกซี"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"ล้างข้อมูล"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"พอร์ตพร็อกซี"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ไม่ใช้พร็อกซีสำหรับ"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"เปิด"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"ปิด"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ปิดใช้งานแล้ว"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"การรับรอง"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"ข้อมูลเซสชัน"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"เปิดใช้งานโหมดฟัง"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"เปิดใช้งาน \"ไป\" อัตโนมัติ"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"หยุดชั่วคราว"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"เล่นต่อ"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"การกำหนดค่า WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"ฟังช่อง"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"ช่องปฏิบัติการ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะแท็บเล็ตกับอุปกรณ์อื่น"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"จัดการแผนบริการข้อมูลบนมือถือ"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"แผนบริการอุปกรณ์เคลื่อนที่"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"แอป SMS ค่าเริ่มต้น"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"เปลี่ยนแอป SMS ไหม"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"ใช้ <xliff:g id="NEW_APP">%s</xliff:g> เป็นแอปพลิเคชัน SMS ของคุณแทน <xliff:g id="CURRENT_APP">%s</xliff:g> ไหม"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ผู้ให้บริการซิมที่ไม่รู้จัก"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ไม่มีเว็บไซต์การจัดสรรที่รู้จัก"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"โปรดใส่ซิมการ์ดและรีสตาร์ท"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"โหมด"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ความแม่นยำสูง"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ประหยัดแบตเตอรี่"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"เซ็นเซอร์ของอุปกรณ์เท่านั้น"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ปิดตำแหน่ง"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"คำขอตำแหน่งล่าสุด"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ไม่มีแอปใดทำการขอตำแหน่งเมื่อเร็วๆ นี้"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ชั่วโมง <xliff:g id="MINUTES">%2$d</xliff:g>นาที <xliff:g id="SECONDS">%3$d</xliff:g>วินาที"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>นาที <xliff:g id="SECONDS">%2$d</xliff:g>วินาที"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> วินาที"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> วัน <xliff:g id="HOURS">%2$d</xliff:g> ชั่วโมง <xliff:g id="MINUTES">%3$d</xliff:g> นาที"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> ชั่วโมง <xliff:g id="MINUTES">%2$d</xliff:g> นาที"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> นาที"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"สถิติการใช้งาน"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"สถิติการใช้งาน"</string>
     <string name="display_order_text" msgid="8592776965827565271">"จัดเรียงตาม:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"บริการการพิมพ์"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"เอกสารของคุณอาจผ่านเซิร์ฟเวอร์มากกว่าหนึ่งเครื่องระหว่างไปยังเครื่องพิมพ์"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"การตั้งค่า"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"เพิ่มเครื่องพิมพ์"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"เพิ่มบริการ"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"เพิ่มเครื่องพิมพ์"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ค้นหา"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"กำลังค้นหาเครื่องพิมพ์"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"งานพิมพ์"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"งานพิมพ์ที่ดำเนินการอยู่"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"แบตเตอรี่"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"อะไรที่ใช้งานแบตเตอรี่อยู่"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ไม่มีข้อมูลการใช้แบตเตอรี่"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"สถิติเกี่ยวกับกระบวนงาน"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"สถิติเชิงลึกเกี่ยวกับกระบวนงานที่ทำงานอยู่"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"การใช้หน่วยความจำ"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"แอป <xliff:g id="TYPE">%1$s</xliff:g> ในช่วง <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"พื้นหลัง"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"พื้นหน้า"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"แคช"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ขณะนี้หน่วยความจำอุปกรณ์มีสถานะ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"การใช้ RAM เฉลี่ย"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"การใช้ RAM สูงสุด"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"เวลาที่แสดง"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"บริการ"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"แสดงระบบ"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"ใช้ Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"ประเภทสถิติ"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"พื้นหลัง"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"พื้นหน้า"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"แคช"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"อินพุตและเอาต์พุตเสียง"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"การตั้งค่าอินพุตและเอาต์พุตเสียง"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ค้นหาด้วยเสียง"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"การตั้งค่า 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"ตั้งค่าและจัดการเครือข่าย 4G และโมเด็ม"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"พิมพ์รหัสผ่านเพื่อถอดรหัสที่จัดเก็บข้อมูล"</string>
     <string name="try_again" msgid="4272075051293936921">"ลองอีกครั้ง"</string>
@@ -1959,7 +1934,7 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"ปิดใช้งานแล้ว"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
-    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"เครือข่ายอาจได้รับการตรวจสอบ"</string>
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"เครือข่ายอาจถูกตรวจสอบ"</string>
     <string name="done_button" msgid="1991471253042622230">"เสร็จสิ้น"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"การตรวจสอบเครือข่าย"</string>
     <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"อุปกรณ์นี้ได้รับการจัดการโดย: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nผู้ดูแลระบบของคุณสามารถตรวจสอบกิจกรรมในเครือข่ายของคุณ ซึ่งรวมถึงอีเมล แอป และเว็บไซต์ที่มีการรักษาความปลอดภัย\n\nสำหรับข้อมูลเพิ่มเติม โปรดติดต่อผู้ดูแลระบบของคุณ"</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"บัญชีสำหรับเนื้อหา"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"การแจ้งเครือข่ายที่ใช้งาน"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"เลือกประเภทของการแจ้งเตือนฉุกเฉินที่จะแสดง"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"ข้อจำกัดแอปพลิเคชันและเนื้อหา"</string>
     <string name="user_rename" msgid="8523499513614655279">"เปลี่ยนชื่อ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ตั้งข้อจำกัดแอป"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 768c373..e3af5ba 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Simulan ang <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Account:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Mga setting ng proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"I-clear"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port ng proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bypass proxy para sa"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Naka-on"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Naka-off"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Hindi pinagana"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Certification"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Impormasyon ng session"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"I-enable ang mode ng pakikinig"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"I-enable ang autonomous na GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"I-pause"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Magpatuloy"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Configuration ng WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Channel ng pakikinig"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Tumatakbong channel"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Payagan ang palitan ng data kapag dumikit ang tablet sa isa pang device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Pamahalaan ang mobile plan"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobile plan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Default na SMS app"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Palitan ang SMS app?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> sa halip na ang <xliff:g id="CURRENT_APP">%s</xliff:g> bilang iyong SMS application?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Hindi kilalang operator ng SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Walang kilalang nagpoprobisyong website ang %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Mangyaring magpasok ng SIM card at mag-restart"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Napakatumpak"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pagtitipid ng baterya"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Mga sensor ng device lang"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Naka-off ang lokasyon"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Mga bagong hiling sa lokasyon"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Walang apps ang humiling ng lokasyon kamakailan"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"mga <xliff:g id="SECONDS">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>a <xliff:g id="HOURS">%2$d</xliff:g>o <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>o <xliff:g id="MINUTES">%2$d</xliff:g>m"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>m"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Mga istatistika sa paggamit"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Mga istatistika sa paggamit"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Pag-uri-uriin ayon sa:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Maaaring dumaan ang iyong dokumento sa isa o higit pang mga server sa pagpunta nito sa printer."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Magdagdag ng mga printer"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Magdagdag ng serbisyo"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Magdagdag ng printer"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Maghanap"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Naghahanap ng mga printer"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Mga pag-print"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Mga aktibong pag-print"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ano ang gumagamit ng baterya"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Di avail data ng gmit baterya."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Mga Istatistika ng Proseso"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Mahahalagang istatistika tungkol sa mga tumatakbong proseso"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Memory na ginamit"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> apps tapos na sa <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Background"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Foreground"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Naka-cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Kasalukuyang <xliff:g id="MEMSTATE">%1$s</xliff:g> ang memory ng device"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Average na paggamit ng RAM"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum na paggamit ng RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Oras ng paggana"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Mga Serbisyo"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Ipakita ang system"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Gamitin ang Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uri ng mga stats"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Background"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Foreground"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Naka-cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Input &amp; output ng boses"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Pag-input ng boses &amp; mga setting ng output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Paghahanap gamit ang boses"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Hindi makapag-sync nang manu-mano"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kasalukuyang hindi pinagana ang pag-sync para sa item na ito. Upang baguhin ang setting na ito, pansamantalang i-on ang data ng background at awtomatikong pag-sync."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Mga setting na 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"I-set up at pamahalaan ang network at modem na 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"I-type ang password upang i-decrypt ang storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Subukang muli."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mga cell broadcast"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Piliin ang mga uri ng mga alerto sa emergency na ipapakita."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Mga paghihigpit sa app at nilalaman"</string>
     <string name="user_rename" msgid="8523499513614655279">"I-RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Magtakda ng mga paghihigpit sa app"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c23967b..d6a31bf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Bağlı (mesaj erişimi yok)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlandı (telefon veya medya yok)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Bağlantı kesildi"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantısı isteği"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için dokunun."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Telefon defterine erişim isteği"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s, kişilerinize ve çağrı geçmişinize erişmek istiyor. %2$s uygulamasına erişim izni verilsin mi?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Tekrar sorma"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Tekrar sorma"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Mesaj erişim isteği"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> işlemini başlat"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Hesap:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy ayarları"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Temizle"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy bağlantı noktası"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Şunlar için proxy\'yi atla:"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Giriş cihazı"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet erişimi"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Erişimi"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> medya ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> eller serbest ses profilinden ayrılacak."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> giriş cihazından ayrılacak."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP\'ye bağlı"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Giriş cihazına bağlı"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet erişimi için cihaza bağlandı"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"MAP için kullan"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Yuva Ayarları"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ses öğesi için yuvayı kullan"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Açık"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Kapalı"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Devre dışı"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Sertifika"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Oturum bilgileri"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Dinleme modunu etkinleştir"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Otonom GO\'yu etkinleştir"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Duraklat"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Devam ettir"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS yapılandırması"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Dinleme kanalı"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Çalıştırma kanalı"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Kablosuz hotspot kurulumu yap"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Ortak Erişim Noktası"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobil planı yönet"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobil plan"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Varsayılan SMS uygulaması"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS uygulaması değiştirilsin mi?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"SMS uygulamanız olarak <xliff:g id="CURRENT_APP">%s</xliff:g> yerine <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Bilinmeyen SIM operatörü"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s için bilinen bir provizyon web sitesi yok"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lütfen SIM kartı takın ve yeniden başlatın"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksek doğruluk"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pil tasarrufu"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Yalnızca cihaz sensörleri"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Konum bilgisi kapalı"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son konum istekleri"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Yakın zamanda hiçbir uygulama konum bilgisi isteğinde bulunmadı"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>s <xliff:g id="MINUTES">%2$d</xliff:g>d <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>d <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> g <xliff:g id="HOURS">%2$d</xliff:g> sa <xliff:g id="MINUTES">%3$d</xliff:g> dk"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> sa <xliff:g id="MINUTES">%2$d</xliff:g> dk"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> dk"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Kullanım istatistikleri"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Kullanım istatistikleri"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sıralama ölçütü:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Yazdırma hizmetleri"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Dokümanınız yazıcıya giderken bir veya daha fazla sunucudan geçebilir."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ayarlar"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Yazıcı ekle"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Hizmet ekle"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Yazıcı ekle"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Ara"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Yazıcılar aranıyor"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Yazdırma işleri"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Etkin yazdırma işleri"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Pil kullanım verisi yok."</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"İşlem İstatistikleri"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Meraklısı için, çalışan işlemlerle ilgili istatistikler"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TIME">%2$s</xliff:g> süresince <xliff:g id="TYPE">%1$s</xliff:g> uygulamaları"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Arka plan"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ön plan"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Önbelleğe alındı"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Cihaz belleğinin mevcut durumu: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ortalama RAM kullanımı"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum RAM kullanımı"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Çalışma süresi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Hizmetler"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Sistem işlemlerini göster"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Uss\'yi (Benzersiz Grup Büyüklüğü) kullan"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"İstatistik türü"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Arka plan"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Ön plan"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Önbelleğe alındı"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ses girişi/çıkışı"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ses giriş/çıkış ayarları"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ses ile arama"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"El ile senkronize edilemez"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Bu ayarı değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G ayarları"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"4G ağı ve modemi kurma ve yönetme"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
     <string name="enter_password" msgid="4131758584074246224">"Depolamanın şifresini çözmek için şifre yazın"</string>
     <string name="try_again" msgid="4272075051293936921">"Tekrar deneyin."</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled (Devre dışı)"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Serbest)"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Ağ etkinliği izlenebilir"</string>
+    <string name="done_button" msgid="1991471253042622230">"Tamamlandı"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ağ izleme"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Bu cihaz, <xliff:g id="MANAGING_DOMAIN">%s</xliff:g> tarafından yönetilmektedir.\n\nE-postalarınız, uygulamalarınız ve güvenli web siteleriniz dahil olmak üzere ağ etkinlikleriniz yöneticiniz tarafından izlenebilir.\n\nDaha fazla bilgi edinmek için yöneticinizle görüşün."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"E-postalarınız, uygulamalarınız ve güvenli web siteleriniz\ndahil olmak üzere ağ etkinliğiniz üçüncü bir tarafça izlenebilir.\n\nCihazınızda yüklü güvenilir bir kimlik bilgisi bunu mümkün kılmaktadır."</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Güvenilen kimlik bilgilerini kontrol et"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"Kullanıcı veya profil ekle"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Uygulamalara ve içeriğe izin ver"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Kısıtlamalı uygulamalar"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Uygulama ayarlarını genişlet"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Bu uygulamanın yüklemesini kaldır"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Bu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hücre yayınları"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Görüntülenecek acil durum uyarı türünü seçin."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Uygulama ve içerik kısıtlamaları"</string>
     <string name="user_rename" msgid="8523499513614655279">"ADI DEĞİŞTİR"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Uygulama kısıtlamalarını ayarla"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7c4ae97..5a5a59f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Запуск. <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Обл. запис:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Налаштування проксі-сервера"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Проксі"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Очистити"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Порт проксі-сервера"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Обходити проксі-сервер для"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Увімкнено"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Вимкнено"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Вимкнено"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Сертифікація"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Дані сеансу"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Увімкнути режим слухання"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Увімкнути незалежного власника групи"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Призупинити"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Відновити"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Конфігурація WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Канал для слухання"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Поточний канал"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дозволити обмін даними, коли планшетний ПК торкнеться іншого пристрою"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Прив\'язку <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде скасовано."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Довідка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Керувати тарифним планом"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарифний план"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Програма для SMS за умовчанням"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Змінити програму для SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Використовувати для SMS програму <xliff:g id="NEW_APP">%s</xliff:g> замість <xliff:g id="CURRENT_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Невідомий оператор SIM-карти"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s не має веб-сайту для мобільних"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставте SIM-карту та перезапустіть"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заощадження заряду акумулятора"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Лише датчики пристрою"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Надсилання геоданих вимкнено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити геоданих"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жодна програма не запитувала місцезнаходження останнім часом"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>год. <xliff:g id="MINUTES">%2$d</xliff:g>хв. <xliff:g id="SECONDS">%3$d</xliff:g>с."</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>хв. <xliff:g id="SECONDS">%2$d</xliff:g>с."</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>сек."</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> дн <xliff:g id="HOURS">%2$d</xliff:g> год <xliff:g id="MINUTES">%3$d</xliff:g> хв"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> год <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> хв"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Статист. використ."</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Статистика викор."</string>
     <string name="display_order_text" msgid="8592776965827565271">"Сорт. за:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Налаштування друку"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"На шляху до принтера документ може проходити через декілька серверів."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Налаштування"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додати принтери"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додати службу"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Додати принтер"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Пошук"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Пошук принтерів"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Завдання друку"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Активні завдання друку"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На що споживається заряд акумулятора"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Дані використання акумулятора недоступні"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика про процеси"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Статистика про запущені процеси"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Використання пам’яті"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> програми за <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Фонові"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Активні"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Кешовані"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Поточний стан пам’яті пристрою: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Сер. використання оперативної пам’яті"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Макс. використання оперативної пам’яті"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Час виконання"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Служби"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Показувати систему"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Використовувати USS (Unique Set Size)"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистики"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Фонові"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Активні"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Кешовані"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Голосовий ввід і вивід"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Налашт-ня голосового вводу та виводу"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Голос. пошук"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Неможливо синхронізувати вручну"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронізацію для цього елемента зараз вимкнено. Щоб змінити це налаштування, тимчасово ввімкніть фонові дані й автоматичну синхронізацію."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Налаштування 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Налаштувати 4G мережу та модем і керувати ними"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введіть пароль, щоб розшифрувати носій"</string>
     <string name="try_again" msgid="4272075051293936921">"Повторіть спробу."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Обліковий запис для вмісту"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Обмеження для програм і вмісту"</string>
     <string name="user_rename" msgid="8523499513614655279">"ПЕРЕЙМЕНУВАТИ"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Установити обмеження для програм"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 383f4c8..99ebc9c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Bắt đầu <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Tài khoản:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Cài đặt proxy"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Xóa"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Cổng proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Bỏ qua proxy cho"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Bật"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Tắt"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Đã bị vô hiệu hóa"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Chứng nhận"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Thông tin về phiên"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Bật chế độ nghe"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Bật GO độc lập"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Tạm dừng"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Tiếp tục"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Cấu hình WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kênh nghe"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Kênh hoạt động"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mạng di động"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Quản lý gói dịch vụ di động"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Gói dịch vụ di động"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Ứng dụng SMS mặc định"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Thay đổi ứng dụng SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> thay vì <xliff:g id="CURRENT_APP">%s</xliff:g> làm ứng dụng SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nhà cung cấp SIM không xác định"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s không có trang web cấp phép xác định"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vui lòng lắp thẻ SIM và khởi động lại"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Chế độ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Độ chính xác cao"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Tiết kiệm pin"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Chỉ cảm biến thiết bị"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Tắt vị trí"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Yêu cầu vị trí gần đây"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Không có ứng dụng nào yêu cầu vị trí gần đây"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút <xliff:g id="SECONDS">%3$d</xliff:g> giây"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> phút <xliff:g id="SECONDS">%2$d</xliff:g> giây"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> giây"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> ngày <xliff:g id="HOURS">%2$d</xliff:g> giờ <xliff:g id="MINUTES">%3$d</xliff:g> phút"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> phút"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Thống kê sử dụng"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Thống kê sử dụng"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sắp xếp theo:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Dịch vụ in"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Tài liệu của bạn có thể đi qua một hoặc nhiều máy chủ trên đường đến máy in."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Cài đặt"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Thêm máy in"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Thêm dịch vụ"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Thêm máy in"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Tìm kiếm"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Đang tìm kiếm máy in"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Lệnh in"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Lệnh in đang hoạt động"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Cái gì đang sử dụng pin"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Không có dữ liệu sử dụng pin."</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Số liệu thống kê về quy trình"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Số liệu thống kê chi tiết về các quy trình đang chạy"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Mức sử dụng bộ nhớ"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"Ứng dụng <xliff:g id="TYPE">%1$s</xliff:g> qua <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Nền"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Nền trước"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Đã lưu trong bộ nhớ Cache"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Bộ nhớ thiết bị hiện tại là <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Sử dụng RAM trung bình"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Sử dụng RAM tối đa"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Thời gian chạy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dịch vụ"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Hiển thị hệ thống"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Sử dụng Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Kiểu trạng thái"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Nền"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Nền trước"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Đã lưu trong bộ nhớ Cache"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Cài đặt nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tìm kiếm bằng giọng nói"</string>
@@ -1772,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Cài đặt 4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Thiết lập &amp; quản lý modem và mạng 4G"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Nhập mật khẩu để giải mã bộ nhớ"</string>
     <string name="try_again" msgid="4272075051293936921">"Thử lại."</string>
@@ -2028,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Hạn chế nội dung và ứng dụng"</string>
     <string name="user_rename" msgid="8523499513614655279">"ĐỔI TÊN"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Đặt hạn chế ứng dụng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e21e31c..965ac61 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"已连接"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已连接(无手机)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已连接(无媒体)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已连接(无消息权限)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已连接(没有手机或媒体信号)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已断开连接"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在断开连接..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"蓝牙连接请求"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"触摸可连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗?"</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"电话簿权限申请"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想访问您的联系人信息和通话记录。要向%2$s授予访问权限吗?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再询问"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"消息权限申请"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"启动<xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帐户:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"代理设置"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"代理"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"代理服务器端口"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"对以下网址不使用代理"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"输入设备"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互联网访问"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互联网连接共享"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"消息权限"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与媒体音频断开连接。"</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与免提音频断开连接。"</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>将与输入设备断开连接。"</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已连接到地图"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未连接到文件传输服务器"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已连接到输入设备"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"连接到设备以访问互联网"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用于输入"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用于访问互联网"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用于地图"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"基座设置"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"将基座用于音频"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"将基座用作免提电话"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"开启"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"关闭"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"未启用"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"认证"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"会话信息"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"启用监听模式"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"启用 Autonomous GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"暂停"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"继续"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS 配置"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"监听通道"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"操作通道"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允许平板电脑在接触其他设备时交换数据"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置 WLAN 热点"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>便携式 WLAN 热点"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 热点"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
@@ -1005,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"即将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的网络共享。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"管理手机套餐"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"手机套餐"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"默认短信应用"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"要更改短信应用吗?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"使用“<xliff:g id="NEW_APP">%s</xliff:g>”(取代“<xliff:g id="CURRENT_APP">%s</xliff:g>”)作为您的短信应用?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 运营商"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s没有已知的配置网站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入 SIM 卡,然后重新启动"</string>
@@ -1014,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"耗电量低"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"仅使用设备传感器"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息:关闭"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近没有任何应用申请使用位置信息"</string>
@@ -1378,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>天<xliff:g id="HOURS">%2$d</xliff:g>小时<xliff:g id="MINUTES">%3$d</xliff:g>分钟"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分钟"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>分钟"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"使用情况统计数据"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情况统计数据"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序方式:"</string>
@@ -1450,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"打印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"打印服务"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文档可能会经由一个或多个服务器发送至打印机。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"设置"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"添加打印机"</string>
@@ -1460,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"添加服务"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"添加打印机"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"搜索"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"正在搜索打印机"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"打印作业"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"进行中的打印作业"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"无法获取电池使用数据。"</string>
@@ -1545,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"进程统计信息"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"运行中进程的相关技术统计信息"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"内存用量"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g>应用<xliff:g id="TIME">%2$s</xliff:g>内的统计信息"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"后台"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"前台"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"缓存"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"设备内存当前状态:<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用率"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用率"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服务"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"显示系统"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"使用 USS"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"统计信息类型"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"后台"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"前台"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"缓存"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"语音输入与输出"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"语音输入与输出设置"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"语音搜索"</string>
@@ -1779,8 +1748,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"无法手动同步"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"目前,此条目的同步功能已停用。要更改此设置,请暂时启用后台数据和自动同步功能。"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 设置"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"设置和管理 4G 网络与调制解调器"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
     <string name="enter_password" msgid="4131758584074246224">"键入密码以解密存储设备"</string>
     <string name="try_again" msgid="4272075051293936921">"请重试。"</string>
@@ -1966,18 +1934,12 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"未启用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
-    <!-- no translation found for ssl_ca_cert_warning (2045866713601984673) -->
-    <skip />
-    <!-- no translation found for done_button (1991471253042622230) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_dialog_title (5339377665264149395) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_info_message (2076057204539053958) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
-    <skip />
-    <!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
-    <skip />
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"网络可能会受到监控"</string>
+    <string name="done_button" msgid="1991471253042622230">"完成"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"网络监控"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"此设备由以下企业域管理:<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>。\n\n您的管理员可以监控您的网络活动,包括收发电子邮件、使用应用和浏览安全网站。\n\n如要了解详情,请与您的管理员联系。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以监控您的网络活动,包括\n收发电子邮件、使用应用和浏览安全网站。\n\n如果您在设备上安装受信任的凭据,就可能出现这种情况。"</string>
+    <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"查看受信任的凭据"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
     <string name="user_add_user_menu" msgid="3154537325132012954">"添加用户或个人资料"</string>
@@ -2023,8 +1985,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"卸载此应用"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"此设置会影响这台平板电脑上的所有用户。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
@@ -2042,7 +2003,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"小区广播"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"选择要显示的紧急消息类型。"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"应用和内容限制"</string>
     <string name="user_rename" msgid="8523499513614655279">"重命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"设置应用限制"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a9e5612..1bd6c03 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -133,7 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"已連結"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線(無手機)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體)"</string>
-    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連線 (無訊息存取權)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連結 (無訊息存取權)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線..."</string>
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"啟動 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帳戶:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"代理伺服器設定"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy 通訊埠"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"略過以下 Proxy:"</string>
@@ -496,7 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已連接媒體音頻裝置"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已連接手機耳機"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線至檔案傳輸伺服器"</string>
-    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連線至地圖"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連結地圖"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未連線至檔案傳輸伺服器"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線至輸入裝置"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得互聯網連線"</string>
@@ -506,7 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"用於輸入"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於上網"</string>
-    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地圖使用偏好"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用於地圖"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"座架設定"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"使用座架播放音頻"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"作為手機揚聲器"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"開啟"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"關閉"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"認證"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"工作階段資料"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"啟用收聽模式"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"啟用自動 GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"暫停"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"恢復"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS 設定"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"收聽頻道"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"操作頻道"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
@@ -698,7 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"設定 Wi-Fi 熱點"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> 可攜式 Wi-Fi 熱點"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android 無線基地台"</string>
-    <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
+    <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網絡共享即將中斷。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"流動網絡"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"管理流動數據計劃"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"流動數據計劃"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"預設短訊應用程式"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更短訊應用程式?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"改用「<xliff:g id="NEW_APP">%s</xliff:g>」作為短訊應用程式 (代替「<xliff:g id="CURRENT_APP">%s</xliff:g>」)?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 流動網絡供應商"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有提供任何已知的網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡,並重新啟動裝置"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約電池用量"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"只限裝置感應器"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資料"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分鐘"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"用量統計資料"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"用量統計資料"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序依據:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文件可能會經由一個或以上的伺服器傳送至打印機。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增打印機"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"新增服務"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"新增打印機"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"搜尋"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"正在搜尋打印機"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"列印工作"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"進行中的列印工作"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"查看正在消耗電力的功能"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"程序統計資料"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"執行中程序的技術統計資料"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"應用程式類型:<xliff:g id="TYPE">%1$s</xliff:g>,統計時間長度:<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"背景"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"前景"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"快取"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"裝置記憶體目前的狀態:<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用量"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"背景"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"前景"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"快取"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"語音輸入裝置與輸出裝置"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"語音輸入與輸出裝置設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"語音搜尋"</string>
@@ -1776,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要更改此設定,請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 設定"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"設定與管理 4G 網絡及數據機"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
@@ -1963,11 +1938,11 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
-    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"網路可能會受到監控"</string>
+    <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"網絡可能會受到監管"</string>
     <string name="done_button" msgid="1991471253042622230">"完成"</string>
-    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"網路監控"</string>
-    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"這個裝置由下列網域管理:<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>。\n\n您的管理員可以監控您的網路活動,包括收發電子郵件、使用應用程式及瀏覽安全網站。\n\n如需詳細資訊,請與您的管理員聯絡。"</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以監控您的網路活動,\n包括收發電子郵件、使用應用程式及瀏覽安全網站。\n\n如果您在裝置上安裝信任的憑證,就會造成這種情況。"</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"網絡監管"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"這部裝置由下列網域管理:<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>。\n\n您的管理員可以監控您的網絡活動,包括收發電郵、使用應用程式及瀏覽安全網站。\n\n詳情請與您的管理員聯絡。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"第三方可以監察您的網絡活動,\n包括收發電郵、使用應用程式及瀏覽安全網站。\n\n當裝置安裝了信任的憑證,便可能會出現這種情況。"</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"檢查信任的憑證"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用戶"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用戶和個人檔案"</string>
@@ -2022,8 +1997,8 @@
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string>
     <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的喜好設定?"</string>
-    <string name="nfc_payment_set_default" msgid="5427393822785989090">"輕按並付款時,每次都使用「<xliff:g id="APP">%1$s</xliff:g>」嗎?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"輕按並付款時,每次都使用「<xliff:g id="APP_0">%1$s</xliff:g>」(取代「<xliff:g id="APP_1">%2$s</xliff:g>」) 嗎?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"每次輕按付款都使用「<xliff:g id="APP">%1$s</xliff:g>」嗎?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"每次輕按付款都使用「<xliff:g id="APP_0">%1$s</xliff:g>」(而不使用「<xliff:g id="APP_1">%2$s</xliff:g>」) 嗎?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 碼"</string>
@@ -2032,7 +2007,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"應用程式與內容限制"</string>
     <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"設定應用程式限制"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d3dc2b9..af42545 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -182,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"開始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"帳戶:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Proxy 設定"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"清除"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Proxy 通訊埠"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"略過以下 Proxy:"</string>
@@ -534,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"開啟"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"關閉"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"認證"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"工作階段資訊"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"啟用收聽模式"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"啟用自動 GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"暫停"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"繼續播放"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS 設定"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"收聽頻道"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"操作頻道"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
@@ -998,7 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"管理行動數據傳輸資費方案"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"行動數據傳輸資費方案"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"預設簡訊應用程式"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」(取代「<xliff:g id="CURRENT_APP">%s</xliff:g>」) 做為您的簡訊應用程式?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 行動通訊業者"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有任何已知的佈建網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡,並重新啟動裝置"</string>
@@ -1007,7 +1001,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約耗電量"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"僅限裝置感應器"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"定位服務已關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資訊"</string>
@@ -1371,12 +1366,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小時 <xliff:g id="MINUTES">%3$d</xliff:g> 分鐘"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"使用情形統計資料"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"使用情形統計資料"</string>
     <string name="display_order_text" msgid="8592776965827565271">"排序依據:"</string>
@@ -1443,8 +1435,7 @@
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"列印服務"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用「<xliff:g id="SERVICE">%1$s</xliff:g>」嗎?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文件可能會透過一或多個伺服器輾轉傳送至印表機。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增印表機"</string>
@@ -1453,12 +1444,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"新增服務"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"新增印表機"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"搜尋"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"正在搜尋印表機"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"列印工作"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"進行中的列印工作"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"查看正在消耗電力的功能"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
@@ -1538,33 +1526,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"處理程序統計資料"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"執行中處理程序的相關完善統計資料"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"應用程式類型:<xliff:g id="TYPE">%1$s</xliff:g>,統計時間長度:<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"背景"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"前景"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"快取"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"裝置記憶體目前狀態:<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"RAM 平均使用量"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"背景"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"前景"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"快取"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"語音輸入裝置與輸出裝置"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"語音輸入與輸出裝置設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"語音搜尋"</string>
@@ -1776,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要變更這項設定,請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"4G 設定"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"設定與管理 4G 網路及數據機"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
@@ -2022,8 +1997,8 @@
     <string name="nfc_payment_settings_title" msgid="1121386157283141856">"付款"</string>
     <string name="nfc_payment_no_apps" msgid="5518479703188056016">"DO NOT TRANSLATE ME"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的偏好設定?"</string>
-    <string name="nfc_payment_set_default" msgid="5427393822785989090">"輕按並付款時一律使用「<xliff:g id="APP">%1$s</xliff:g>」嗎?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"輕按並付款時一律使用「<xliff:g id="APP_0">%1$s</xliff:g>」(取代「<xliff:g id="APP_1">%2$s</xliff:g>」) 嗎?"</string>
+    <string name="nfc_payment_set_default" msgid="5427393822785989090">"隨點即付一律使用「<xliff:g id="APP">%1$s</xliff:g>」嗎?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="5642684106041605080">"隨點即付一律改用「<xliff:g id="APP_0">%1$s</xliff:g>」(取代「<xliff:g id="APP_1">%2$s</xliff:g>」) 嗎?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
@@ -2032,7 +2007,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"應用程式與內容限制"</string>
     <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"設定應用程式限制"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3666641..187da87 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -133,8 +133,7 @@
     <string name="bluetooth_connected" msgid="6038755206916626419">"Ixhunyiwe"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ixhunyiwe (ayikho ifoni)"</string>
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ixhunyiwe (ayikho imidiya)"</string>
-    <!-- no translation found for bluetooth_connected_no_map (6504436917057479986) -->
-    <skip />
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Kuxhunyiwe (akukho ukufinyelela umlayezo)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ixhunyiwe (ayikho ifoni noma imidiya)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayixhunyiwe"</string>
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inqamula uxhumano kwi-inthanethi..."</string>
@@ -165,13 +164,11 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Isicelo sohleloxhumano lwe-Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Thinta ukuxhumana ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Uyafuna ukuxhuma ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
-    <!-- no translation found for bluetooth_phonebook_request (3951420080540915279) -->
-    <skip />
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Isicelo sokufinyelela ibhuku lefoni"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"I-%1$s ifuna ukufinyelela kothintana nabo nomlando wekholi. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ungabuzi futhi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ungabuzi futhi"</string>
-    <!-- no translation found for bluetooth_map_request (4595727689513143902) -->
-    <skip />
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"Isicelo sokufinyelela umlayezo"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Usuku nezilungiselelo zesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
@@ -185,7 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Qala <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"I-Akhawunti:"</string>
-    <string name="proxy_settings_title" msgid="5912878565897294401">"Izilungiselelo zommeleli"</string>
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Ummeleli"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Sula"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Imbobo yephrokzi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Dula iphrokzi ye-"</string>
@@ -483,8 +480,7 @@
     <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Idivaysi yokufakwayo"</string>
     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukufinyelela i-Inthanethi"</string>
     <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</string>
-    <!-- no translation found for bluetooth_profile_map (5465271250454324383) -->
-    <skip />
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ukufinyelela umlayezo"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kwidivaysi yokufakwayo."</string>
@@ -500,8 +496,7 @@
     <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string>
     <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string>
     <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_connected (8191407438851351713) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ixhumeke kumephu"</string>
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ayixhunyiwe kwiseva sokudlulisa ifayela"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ixhunywe kwidivaysi yokufakwayo"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ixhunyiwe kwidivaysi yokufinyelela kwi-Inthanethi"</string>
@@ -511,8 +506,7 @@
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sebenziselwa ukudlulisa ifayela"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Isetshenziselwa okufakwayo"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sebenzisa ukufinyelela i-Inthanethi"</string>
-    <!-- no translation found for bluetooth_map_profile_summary_use_for (5154200119919927434) -->
-    <skip />
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Sebenzisela imephu"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Izilungiselelo zokudokha"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sebenzisa ukubeka ingxenye komsindo"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
@@ -540,15 +534,6 @@
     <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vuliwe"</string>
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Valiwe"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Kukhutshaziwe"</string>
-    <string name="wifi_display_certification_heading" msgid="3125105883233765652">"Ukunikezwa isitifiketi"</string>
-    <string name="wifi_display_session_info" msgid="4733627902691604836">"Ulwazi lweseshini"</string>
-    <string name="wifi_display_listen_mode" msgid="2962301785910874273">"Nika amandla imodi yokulalela"</string>
-    <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Nika amandla i-autonomous GO"</string>
-    <string name="wifi_display_pause" msgid="6037110530682927245">"Misa isikhashana"</string>
-    <string name="wifi_display_resume" msgid="8195590160258469425">"Qalisa kabusha"</string>
-    <string name="wifi_display_wps_config" msgid="7566565571340705772">"Ukucushwa kwe-WPS"</string>
-    <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Isiteshi sokulalela"</string>
-    <string name="wifi_display_operating_channel" msgid="233535284689144515">"Isiteshi sokusebenza"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Vumela ukushintshanisa kwedatha uma ithebhulethi ithinta enye idivayisi"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwedatha uma ifoni ithinta enye idivayisi"</string>
@@ -704,8 +689,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Setha i-Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> Wi-Fi hotspot ephathekayo"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Indawo ye-Android"</string>
-    <!-- no translation found for home_settings (212375129455718176) -->
-    <skip />
+    <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
@@ -1006,7 +990,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Amanethiwekhi eselula"</string>
-    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Phatha uhlelo lweselula"</string>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Uhlelo lweselula"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Uhlelo lokusebenza oluzenzakalelayo le-SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Shintsha uhlelo lokusebenza le-SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> kunokusebenzisa i-<xliff:g id="CURRENT_APP">%s</xliff:g> njengohlelo lakho lokusebenza le-SMS?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"I-Opharetha ye-SIM engaziwa"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ayinayo iwebhusayithi eyilungiselelo eyaziwayo"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sicela ufake ikhadi le-SIM bese uqala kabusha"</string>
@@ -1015,7 +1002,8 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Imodi"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ukulunga okuphezulu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhetri"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Izinzwa zedivayisi kuphela"</string>
+    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
+    <skip />
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Indawo ivaliwe"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Izicelo zendawo zakamuva"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
@@ -1385,12 +1373,9 @@
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ihora <xliff:g id="MINUTES">%2$d</xliff:g> amaminithi <xliff:g id="SECONDS">%3$d</xliff:g> amasekhondi"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>amaminithi <xliff:g id="SECONDS">%2$d</xliff:g>amasekhondi"</string>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <!-- no translation found for battery_history_days_no_seconds (703063770554334710) -->
-    <skip />
-    <!-- no translation found for battery_history_hours_no_seconds (663342892615646712) -->
-    <skip />
-    <!-- no translation found for battery_history_minutes_no_seconds (7780294302606853082) -->
-    <skip />
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>izinsuku <xliff:g id="HOURS">%2$d</xliff:g>amahora <xliff:g id="MINUTES">%3$d</xliff:g>amaminithi"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g>amahora <xliff:g id="MINUTES">%2$d</xliff:g>amaminithi"</string>
+    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>amaminithi"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Izibalo zokusetshenziswa"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Izibalo zokusetshenziswa"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Hlunga nge:"</string>
@@ -1457,8 +1442,7 @@
     <string name="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Amasevisi wokuphrinta"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <!-- no translation found for print_service_security_warning_summary (7567131958613064363) -->
-    <skip />
+    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Idokhumenti yakho ingase idlule iseva eyodwa noma amaningi lapho iya kuphrinta."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Izilungiselelo"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Engeza amaphrinta"</string>
@@ -1467,12 +1451,9 @@
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Engeza isevisi"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Engeza iphrinta"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Sesha"</string>
-    <!-- no translation found for print_searching_for_printers (4680248496457576358) -->
-    <skip />
-    <!-- no translation found for print_print_jobs (3582094777756968793) -->
-    <skip />
-    <!-- no translation found for print_active_print_jobs (5055524262003598199) -->
-    <skip />
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"Isesha amaphrinta"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"Imisebenzi yokuphrinta"</string>
+    <string name="print_active_print_jobs" msgid="5055524262003598199">"Imisebenzi yokuphrinta esebenzayo"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Idatha esebenzisa ibhethri ayitholakali."</string>
@@ -1552,33 +1533,21 @@
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Izibalo zenqubo"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Izibalo ze-Geeky mayelana nezinqubo zokuqalisa"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Ukusetshenziswa kwememori"</string>
-    <!-- no translation found for process_stats_total_duration (1869761515101180444) -->
-    <skip />
-    <!-- no translation found for process_stats_type_background (3934992858120683459) -->
-    <skip />
-    <!-- no translation found for process_stats_type_foreground (7713118254089580536) -->
-    <skip />
-    <!-- no translation found for process_stats_type_cached (6314925846944806511) -->
-    <skip />
+    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> izinhlelo zokusebenza ezingaphezulu kuka-<xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"Ingemuva"</string>
+    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Ingaphambili"</string>
+    <string name="process_stats_type_cached" msgid="6314925846944806511">"Kufakwe kunqolobane"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Imemori yedivayisi okwamanje yi-<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
-    <!-- no translation found for process_stats_avg_ram_use (6972943528929394396) -->
-    <skip />
-    <!-- no translation found for process_stats_max_ram_use (3273876448926689261) -->
-    <skip />
+    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Ukusetshenziswa kwe-RAM okumaphakathi nendawo"</string>
+    <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ukusetshenziswa kwe-RAM okukhulu"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Isikhathi sokuqalisa"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Amasevisi"</string>
-    <!-- no translation found for menu_show_system (8864603400415567635) -->
-    <skip />
-    <!-- no translation found for menu_use_uss (467765290771543089) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type (4700209061072120948) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_background (2236161340134898852) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_foreground (2286182659954958586) -->
-    <skip />
-    <!-- no translation found for menu_proc_stats_type_cached (5084272779786820693) -->
-    <skip />
+    <string name="menu_show_system" msgid="8864603400415567635">"Bonisa isistimu"</string>
+    <string name="menu_use_uss" msgid="467765290771543089">"Sebenzisa i-Uss"</string>
+    <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uhlobo lwezibalo"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"Ingemuva"</string>
+    <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"Ingaphambili"</string>
+    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Kufakwe kwinqolobane"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Okufakwayo ngezwi; nokukhishwayo"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Okufakwayo ngezwi; nezilungiselelo zokukhishwayo"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ukusesha ngezwi"</string>
@@ -1786,8 +1755,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ayikwazi ukuvumelanisa ngesandla"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
-    <string name="wimax_settings" msgid="1574837328738396794">"Izilungiselelo ze-4G"</string>
-    <string name="wimax_settings_summary" msgid="3207355006084135453">"Hlela,  uphathe inethiwekhi ye-4G kanye nemodemu"</string>
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Ikheli le-4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Faka iphasiwedi ukuze ususe okufakwe kwindawo yokugcina"</string>
     <string name="try_again" msgid="4272075051293936921">"Zama futhi."</string>
@@ -1975,9 +1943,9 @@
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Inethiwekhi ingase inganyelwe"</string>
     <string name="done_button" msgid="1991471253042622230">"Kwenziwe"</string>
-    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ukwenganyelwa kwenethiwekhi"</string>
-    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Le divayisi iphethwe ngu-: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nUmphathi wakho uyakwazi ukwengamela umsebenzi wenethiwekhi yakho, okufaka phakathi ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile.\n\nUkuze uthole ulwazi oluningi, xhumana nomphathi wakho."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Inkampani  yangaphandle ingakwazi ukungamela umsebenzi wenethiwekhi yakho\n, okufaka phakathi ama-imeyili, izinhlelo zokusebenza namawebhusayithi aphephile.\n\nIsiqinisekiso esethenjwayo kudivayisi yakho senza lokhu kwenzeke."</string>
+    <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"Ukuqashwa kwenethiwekhi"</string>
+    <string name="ssl_ca_cert_info_message" msgid="2076057204539053958">"Le divayisi iphethwe ngu-: <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>.\n\nUmphathi wakho uyakwazi ukweqapha  umsebenzi wenethiwekhi yakho, okufaka phakathi ama-imeyili, izinhlelo zokusebenza, namawebhusayithi aphephile.\n\nUkuze uthole ulwazi oluningi, xhumana nomphathi wakho."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8212122519110935512">"Inkampani  yangaphandle ingakwazi ukuqapha umsebenzi wenethiwekhi yakho\n, okufaka phakathi ama-imeyili, izinhlelo zokusebenza namawebhusayithi aphephile.\n\nIsiqinisekiso esethenjwayo kudivayisi yakho senza lokhu kwenzeke."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Hlola ukuqinisekisa okwethenjwayo"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>
@@ -2024,8 +1992,7 @@
     <string name="application_restrictions" msgid="8207332020898004394">"Vumela izinhlelo zokusebenza nokuqukethwe"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Izinhlelo zokusebenza ezinomkhawulo"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Nweba izilungiselelo zohlelo lokusebenza"</string>
-    <!-- no translation found for home_app_uninstall_button (6808453012607962899) -->
-    <skip />
+    <string name="home_app_uninstall_button" msgid="6808453012607962899">"Khipha lolu hlelo lokusebenza"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
@@ -2043,7 +2010,6 @@
     <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Imikhawulo yohlelo lokusebenza nokuqukethwe"</string>
     <string name="user_rename" msgid="8523499513614655279">"QAMBA KABUSHA"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Misa imikhawulo yohlelo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1bff0cb..370a811 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -684,7 +684,7 @@
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
     <string name="owner_info_settings_title">Owner info</string>
-    <!-- Text shown for title of settings checkbox to disable widgets [CHAR LIMIT=20]-->
+    <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
     <string name="security_enable_widgets_title">Enable widgets</string>
     <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
     <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
@@ -1271,23 +1271,23 @@
     <string name="wifi_display_summary_disabled">Disabled</string>
 
     <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
-    <string name="wifi_display_certification_heading">Certification</string>
+    <string name="wifi_display_certification_heading" translatable="false">Certification</string>
     <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
-    <string name="wifi_display_session_info">Session info</string>
+    <string name="wifi_display_session_info" translatable="false">Session info</string>
     <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_listen_mode">Enable listen mode</string>
+    <string name="wifi_display_listen_mode" translatable="false">Enable listen mode</string>
     <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_autonomous_go">Enable autonomous GO</string>
+    <string name="wifi_display_autonomous_go" translatable="false">Enable autonomous GO</string>
     <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_pause">Pause</string>
+    <string name="wifi_display_pause" translatable="false">Pause</string>
     <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_resume">Resume</string>
+    <string name="wifi_display_resume" translatable="false">Resume</string>
     <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_wps_config">WPS configuration</string>
+    <string name="wifi_display_wps_config" translatable="false">WPS configuration</string>
     <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_listen_channel">Listen channel</string>
+    <string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
     <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
-    <string name="wifi_display_operating_channel">Operating channel</string>
+    <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
 
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
@@ -2409,7 +2409,7 @@
     <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
     <string name="location_mode_battery_saving_title">Battery saving</string>
     <!-- [CHAR LIMIT=30] Location settings screen, device sensors only location mode -->
-    <string name="location_mode_sensors_only_title">Device sensors only</string>
+    <string name="location_mode_sensors_only_title">Device sensors</string>
     <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
     <string name="location_mode_location_off_title">Location off</string>
     <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
@@ -3657,6 +3657,16 @@
     <string name="process_stats_run_time">Run time</string>
     <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
     <string name="services_subtitle">Services</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+    <string name="menu_proc_stats_duration">Duration</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_3h">3 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_6h">6 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_12h">12 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_1d">1 day</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
     <string name="menu_show_system">Show system</string>
     <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 55b3bca..8744328 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -192,7 +192,7 @@
     <header
         android:id="@+id/print_settings"
         android:fragment="com.android.settings.print.PrintSettingsFragment"
-        android:icon="@drawable/ic_print"
+        android:icon="@*android:drawable/ic_print"
         android:title="@string/print_settings" />
 
     <!-- Development -->
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index f9a36f3..968fe91 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -63,6 +63,7 @@
     <timezone id="Asia/Rangoon">Yangon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Jakarta">Jakarta</timezone>
     <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index 6d937fd..bac94d6 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -18,12 +18,14 @@
 
 import java.util.ArrayList;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.ColorFilter;
@@ -94,7 +96,7 @@
 
     void uninstallApp(HomeAppPreference pref) {
         // Uninstallation is done by asking the OS to do it
-       Uri packageURI = Uri.parse("package:" + pref.activityName.getPackageName());
+       Uri packageURI = Uri.parse("package:" + pref.uninstallTarget);
        Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false);
        int requestCode = REQUESTING_UNINSTALL + (pref.isChecked ? 1 : 0);
@@ -144,9 +146,8 @@
             try {
                 Drawable icon = info.loadIcon(mPm);
                 CharSequence name = info.loadLabel(mPm);
-                boolean isSystem = (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
                 HomeAppPreference pref = new HomeAppPreference(context, activityName, prefIndex,
-                        icon, name, this, isSystem);
+                        icon, name, this, info);
                 mPrefs.add(pref);
                 mPrefGroup.addPreference(pref);
                 pref.setEnabled(true);
@@ -186,14 +187,16 @@
     class HomeAppPreference extends Preference {
         ComponentName activityName;
         int index;
-        boolean isSystem;
         HomeSettings fragment;
         final ColorFilter grayscaleFilter;
         boolean isChecked;
 
+        boolean isSystem;
+        String uninstallTarget;
+
         public HomeAppPreference(Context context, ComponentName activity,
                 int i, Drawable icon, CharSequence title,
-                HomeSettings parent, boolean sys) {
+                HomeSettings parent, ActivityInfo info) {
             super(context);
             setLayoutResource(R.layout.preference_home_app);
             setIcon(icon);
@@ -201,13 +204,41 @@
             activityName = activity;
             fragment = parent;
             index = i;
-            isSystem = sys;
 
             ColorMatrix colorMatrix = new ColorMatrix();
             colorMatrix.setSaturation(0f);
             float[] matrix = colorMatrix.getArray();
             matrix[18] = 0.5f;
             grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);
+
+            determineTargets(info);
+        }
+
+        // Check whether this activity is bundled on the system, with awareness
+        // of the META_HOME_ALTERNATE mechanism.
+        private void determineTargets(ActivityInfo info) {
+            final Bundle meta = info.metaData;
+            if (meta != null) {
+                final String altHomePackage = meta.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (altHomePackage != null) {
+                    try {
+                        final int match = mPm.checkSignatures(info.packageName, altHomePackage);
+                        if (match >= PackageManager.SIGNATURE_MATCH) {
+                            PackageInfo altInfo = mPm.getPackageInfo(altHomePackage, 0);
+                            final int altFlags = altInfo.applicationInfo.flags;
+                            isSystem = (altFlags & ApplicationInfo.FLAG_SYSTEM) != 0;
+                            uninstallTarget = altInfo.packageName;
+                            return;
+                        }
+                    } catch (Exception e) {
+                        // e.g. named alternate package not found during lookup
+                        Log.w(TAG, "Unable to compare/resolve alternate", e);
+                    }
+                }
+            }
+            // No suitable metadata redirect, so use the package's own info
+            isSystem = (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+            uninstallTarget = info.packageName;
         }
 
         @Override
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 6b6e704..ac67a38 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -564,7 +564,9 @@
                 int headerIndex = i + 1;
                 i = insertAccountsHeaders(target, headerIndex);
             } else if (id == R.id.home_settings) {
-                updateHomeSettingHeaders(header);
+                if (!updateHomeSettingHeaders(header)) {
+                    target.remove(i);
+                }
             } else if (id == R.id.user_settings) {
                 if (!UserHandle.MU_ENABLED
                         || !UserManager.supportsMultipleUsers()
@@ -665,49 +667,20 @@
         return headerIndex;
     }
 
-    private boolean isSystemApp(ResolveInfo ri) {
-        return ((ri.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-    }
-
-    private void updateHomeSettingHeaders(Header header) {
-        final PackageManager pm = getPackageManager();
-        final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
+    private boolean updateHomeSettingHeaders(Header header) {
         try {
-            ComponentName currentHome = pm.getHomeActivities(homeApps);
-            ResolveInfo iconSource = null;
-            if (currentHome == null) {
-                // no current default, so find the system home app and use that
-                for (int which = 0; which < homeApps.size(); which++) {
-                    ResolveInfo ri = homeApps.get(which);
-                    if (isSystemApp(ri)) {
-                        iconSource = ri;
-                        break;
-                    }
-                }
-            } else {
-                // find the current-home entry in the returned set
-                for (int which = 0; which < homeApps.size(); which++) {
-                    ResolveInfo ri = homeApps.get(which);
-                    ComponentName riName = new ComponentName(ri.activityInfo.packageName,
-                            ri.activityInfo.name);
-                    if (riName.equals(currentHome)) {
-                        iconSource = ri;
-                        break;
-                    }
-                }
-            }
-            if (iconSource != null) {
-                if (header.extras == null) {
-                    header.extras = new Bundle();
-                }
-                header.extras.putParcelable(HomeSettings.CURRENT_HOME, iconSource.activityInfo);
-            } else {
-                Log.v(LOG_TAG, "No home app icon found");
+            final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
+            getPackageManager().getHomeActivities(homeApps);
+            if (homeApps.size() < 2) {
+                // When there's only one available home app, omit this settings
+                // category entirely at the top level UI.
+                return false;
             }
         } catch (Exception e) {
             // Can't look up the home activity; bail on configuring the icon
             Log.w(LOG_TAG, "Problem looking up home activity!", e);
         }
+        return true;
     }
 
     private void getMetaData() {
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index e9b7419..756705d 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -281,6 +281,7 @@
 
         mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION);
         mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+        initSmsApplicationSetting();
 
         // Remove NSD checkbox by default
         getPreferenceScreen().removePreference(nsd);
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 37c33db..1b3938c 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -66,6 +66,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -143,6 +144,8 @@
 
     private PackageMoveObserver mPackageMoveObserver;
 
+    private final HashSet<String> mHomePackages = new HashSet<String>();
+
     private boolean mDisableAfterUninstall;
 
     private boolean mHaveSizes = false;
@@ -320,29 +323,20 @@
 
     private boolean handleDisableable(Button button) {
         boolean disableable = false;
-        try {
-            // Try to prevent the user from bricking their phone
-            // by not allowing disabling of apps signed with the
-            // system cert and any launcher app in the system.
-            PackageInfo sys = mPm.getPackageInfo("android",
-                    PackageManager.GET_SIGNATURES);
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.addCategory(Intent.CATEGORY_HOME);
-            intent.setPackage(mAppEntry.info.packageName);
-            List<ResolveInfo> homes = mPm.queryIntentActivities(intent, 0);
-            if ((homes != null && homes.size() > 0) || isThisASystemPackage()) {
-                // Disable button for core system applications.
-                button.setText(R.string.disable_text);
-            } else if (mAppEntry.info.enabled) {
-                button.setText(R.string.disable_text);
-                disableable = true;
-            } else {
-                button.setText(R.string.enable_text);
-                disableable = true;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "Unable to get package info", e);
+        // Try to prevent the user from bricking their phone
+        // by not allowing disabling of apps signed with the
+        // system cert and any launcher app in the system.
+        if (mHomePackages.contains(mAppEntry.info.packageName) || isThisASystemPackage()) {
+            // Disable button for core system applications.
+            button.setText(R.string.disable_text);
+        } else if (mAppEntry.info.enabled) {
+            button.setText(R.string.disable_text);
+            disableable = true;
+        } else {
+            button.setText(R.string.enable_text);
+            disableable = true;
         }
+
         return disableable;
     }
 
@@ -638,6 +632,21 @@
         return packageName;
     }
 
+    private boolean signaturesMatch(String pkg1, String pkg2) {
+        if (pkg1 != null && pkg2 != null) {
+            try {
+                final int match = mPm.checkSignatures(pkg1, pkg2);
+                if (match >= PackageManager.SIGNATURE_MATCH) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // e.g. named alternate package not found during lookup;
+                // this is an expected case sometimes
+            }
+        }
+        return false;
+    }
+
     private boolean refreshUi() {
         if (mMoveInProgress) {
             return true;
@@ -652,6 +661,25 @@
             return false; // onCreate must have failed, make sure to exit
         }
 
+        // Get list of "home" apps and trace through any meta-data references
+        List<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        mPm.getHomeActivities(homeActivities);
+        mHomePackages.clear();
+        for (int i = 0; i< homeActivities.size(); i++) {
+            ResolveInfo ri = homeActivities.get(i);
+            final String activityPkg = ri.activityInfo.packageName;
+            mHomePackages.add(activityPkg);
+
+            // Also make sure to include anything proxying for the home app
+            final Bundle metadata = ri.activityInfo.metaData;
+            if (metadata != null) {
+                final String metaPkg = metadata.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (signaturesMatch(metaPkg, activityPkg)) {
+                    mHomePackages.add(metaPkg);
+                }
+            }
+        }
+
         // Get list of preferred activities
         List<ComponentName> prefActList = new ArrayList<ComponentName>();
         
@@ -1237,8 +1265,8 @@
             intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
             intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
             intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
-            getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
-                    Activity.RESULT_CANCELED, null, null);
+            getActivity().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
+                    mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
         }
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 7601309..b7ffcef 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -56,15 +56,18 @@
     private static final String KEY_APP_LIST = "app_list";
     private static final String KEY_MEM_STATUS = "mem_status";
 
-    private static final int MENU_STATS_REFRESH = Menu.FIRST;
-    private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1;
-    private static final int MENU_USE_USS = Menu.FIRST + 2;
-    private static final int MENU_TYPE_BACKGROUND = Menu.FIRST + 3;
-    private static final int MENU_TYPE_FOREGROUND = Menu.FIRST + 4;
-    private static final int MENU_TYPE_CACHED = Menu.FIRST + 5;
-    private static final int MENU_HELP = Menu.FIRST + 6;
+    private static final int NUM_DURATIONS = 4;
 
-    static final int MAX_ITEMS_TO_LIST = 40;
+    private static final int MENU_STATS_REFRESH = Menu.FIRST;
+    private static final int MENU_DURATION = Menu.FIRST + 1;
+    private static final int MENU_SHOW_SYSTEM = MENU_DURATION + NUM_DURATIONS;
+    private static final int MENU_USE_USS = MENU_SHOW_SYSTEM + 1;
+    private static final int MENU_TYPE_BACKGROUND = MENU_USE_USS + 1;
+    private static final int MENU_TYPE_FOREGROUND = MENU_TYPE_BACKGROUND + 1;
+    private static final int MENU_TYPE_CACHED = MENU_TYPE_FOREGROUND + 1;
+    private static final int MENU_HELP = MENU_TYPE_CACHED + 1;
+
+    static final int MAX_ITEMS_TO_LIST = 60;
 
     final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
         @Override
@@ -85,10 +88,13 @@
     ProcessStats mStats;
     int mMemState;
 
+    private long mDuration;
+    private long mLastDuration;
     private boolean mShowSystem;
     private boolean mUseUss;
     private int mStatsType;
 
+    private MenuItem[] mDurationMenus = new MenuItem[NUM_DURATIONS];
     private MenuItem mShowSystemMenu;
     private MenuItem mUseUssMenu;
     private MenuItem mTypeBackgroundMenu;
@@ -101,6 +107,21 @@
     long mMaxWeight;
     long mTotalTime;
 
+    // The actual duration value to use for each duration option.  Note these
+    // are lower than the actual duration, since our durations are computed in
+    // batches of 3 hours so we want to allow the time we use to be slightly
+    // smaller than the actual time selected instead of bumping up to 3 hours
+    // beyond it.
+    private static final long DURATION_QUANTUM = 3*60*60*1000;
+    private static long[] sDurations = new long[] {
+        3*60*60*1000 - DURATION_QUANTUM/2, 6*60*60*1000 - DURATION_QUANTUM/2,
+        12*60*60*1000 - DURATION_QUANTUM/2, 24*60*60*1000 - DURATION_QUANTUM/2
+    };
+    private static int[] sDurationLabels = new int[] {
+            R.string.menu_duration_3h, R.string.menu_duration_6h,
+            R.string.menu_duration_12h, R.string.menu_duration_1d
+    };
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -115,6 +136,7 @@
         mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mMemStatusPref = mAppListGroup.findPreference(KEY_MEM_STATUS);
+        mDuration = icicle != null ? icicle.getLong("duration", sDurations[0]) : sDurations[0];
         mShowSystem = icicle != null ? icicle.getBoolean("show_system") : false;
         mUseUss = icicle != null ? icicle.getBoolean("use_uss") : false;
         mStatsType = icicle != null ? icicle.getInt("stats_type", MENU_TYPE_BACKGROUND)
@@ -136,6 +158,7 @@
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
+        outState.putLong("duration", mDuration);
         outState.putBoolean("show_system", mShowSystem);
         outState.putBoolean("use_uss", mUseUss);
         outState.putInt("stats_type", mStatsType);
@@ -174,31 +197,31 @@
                 .setAlphabeticShortcut('r');
         refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        SubMenu subMenu = menu.addSubMenu(R.string.menu_proc_stats_duration);
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            mDurationMenus[i] = subMenu.add(0, MENU_DURATION+i, 0, sDurationLabels[i])
+                            .setCheckable(true);
+        }
         mShowSystemMenu = menu.add(0, MENU_SHOW_SYSTEM, 0, R.string.menu_show_system)
                 .setAlphabeticShortcut('s')
-                .setCheckable(true)
-                .setChecked(mShowSystem)
-                .setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+                .setCheckable(true);
         mUseUssMenu = menu.add(0, MENU_USE_USS, 0, R.string.menu_use_uss)
-                .setAlphabeticShortcut('s')
-                .setCheckable(true)
-                .setChecked(mUseUss);
-        SubMenu subMenu = menu.addSubMenu(R.string.menu_proc_stats_type);
+                .setAlphabeticShortcut('u')
+                .setCheckable(true);
+        subMenu = menu.addSubMenu(R.string.menu_proc_stats_type);
         mTypeBackgroundMenu = subMenu.add(0, MENU_TYPE_BACKGROUND, 0,
                 R.string.menu_proc_stats_type_background)
                 .setAlphabeticShortcut('b')
-                .setCheckable(true)
-                .setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+                .setCheckable(true);
         mTypeForegroundMenu = subMenu.add(0, MENU_TYPE_FOREGROUND, 0,
                 R.string.menu_proc_stats_type_foreground)
                 .setAlphabeticShortcut('f')
-                .setCheckable(true)
-                .setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+                .setCheckable(true);
         mTypeCachedMenu = subMenu.add(0, MENU_TYPE_CACHED, 0,
                 R.string.menu_proc_stats_type_cached)
-                .setAlphabeticShortcut('c')
-                .setCheckable(true)
-                .setChecked(mStatsType == MENU_TYPE_CACHED);
+                .setCheckable(true);
+
+        updateMenus();
 
         /*
         String helpUrl;
@@ -209,9 +232,44 @@
         */
     }
 
+    void updateMenus() {
+        int closestIndex = 0;
+        long closestDelta = Math.abs(sDurations[0]-mDuration);
+        for (int i=1; i<NUM_DURATIONS; i++) {
+            long delta = Math.abs(sDurations[i]-mDuration);
+            if (delta < closestDelta) {
+                closestDelta = delta;
+                closestIndex = i;
+            }
+        }
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            if (mDurationMenus[i] != null) {
+                mDurationMenus[i].setChecked(i == closestIndex);
+            }
+        }
+        mDuration = sDurations[closestIndex];
+        if (mShowSystemMenu != null) {
+            mShowSystemMenu.setChecked(mShowSystem);
+            mShowSystemMenu.setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mUseUssMenu != null) {
+            mUseUssMenu.setChecked(mUseUss);
+        }
+        if (mTypeBackgroundMenu != null) {
+            mTypeBackgroundMenu.setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mTypeForegroundMenu != null) {
+            mTypeForegroundMenu.setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+        }
+        if (mTypeCachedMenu != null) {
+            mTypeCachedMenu.setChecked(mStatsType == MENU_TYPE_CACHED);
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
+        final int id = item.getItemId();
+        switch (id) {
             case MENU_STATS_REFRESH:
                 mStats = null;
                 refreshStats();
@@ -231,6 +289,10 @@
                 refreshStats();
                 return true;
             default:
+                if (id >= MENU_DURATION && id < (MENU_DURATION+NUM_DURATIONS)) {
+                    mDuration = sDurations[id-MENU_DURATION];
+                    refreshStats();
+                }
                 return false;
         }
     }
@@ -258,25 +320,10 @@
     };
 
     private void refreshStats() {
-        if (mStats == null) {
-            load();
-        }
+        updateMenus();
 
-        if (mShowSystemMenu != null) {
-            mShowSystemMenu.setChecked(mShowSystem);
-            mShowSystemMenu.setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
-        }
-        if (mUseUssMenu != null) {
-            mUseUssMenu.setChecked(mUseUss);
-        }
-        if (mTypeBackgroundMenu != null) {
-            mTypeBackgroundMenu.setChecked(mStatsType == MENU_TYPE_BACKGROUND);
-        }
-        if (mTypeForegroundMenu != null) {
-            mTypeForegroundMenu.setChecked(mStatsType == MENU_TYPE_FOREGROUND);
-        }
-        if (mTypeCachedMenu != null) {
-            mTypeCachedMenu.setChecked(mStatsType == MENU_TYPE_CACHED);
+        if (mStats == null || mLastDuration != mDuration) {
+            load();
         }
 
         int[] stats;
@@ -390,7 +437,7 @@
             ProcStatsEntry proc = procs.get(i);
             final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100;
             final double percentOfTime = (((double)proc.mDuration) / mTotalTime) * 100;
-            if (percentOfWeight < 2) break;
+            if (percentOfWeight < 1) break;
             ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc);
             proc.evaluateTargetPackage(mStats, totals, sEntryCompare, mUseUss,
                     mStatsType == MENU_TYPE_BACKGROUND);
@@ -425,44 +472,18 @@
 
     private void load() {
         try {
+            mLastDuration = mDuration;
             mMemState = mProcessStats.getCurrentMemoryState();
-            ArrayList<ParcelFileDescriptor> fds = new ArrayList<ParcelFileDescriptor>();
-            byte[] data = mProcessStats.getCurrentStats(fds);
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(data, 0, data.length);
-            parcel.setDataPosition(0);
-            mStats = ProcessStats.CREATOR.createFromParcel(parcel);
-            int i = fds.size()-1;
-            while (i >= 0 && (mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime)
-                    < (24*60*60*1000)) {
-                Log.i(TAG, "Not enough data, loading next file @ " + i);
-                ProcessStats stats = new ProcessStats(false);
-                InputStream stream = new ParcelFileDescriptor.AutoCloseInputStream(fds.get(i));
-                stats.read(stream);
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                }
-                if (stats.mReadError == null) {
-                    mStats.add(stats);
-                    StringBuilder sb = new StringBuilder();
-                    sb.append("Added stats: ");
-                    sb.append(stats.mTimePeriodStartClockStr);
-                    sb.append(", over ");
-                    TimeUtils.formatDuration(
-                            stats.mTimePeriodEndRealtime-stats.mTimePeriodStartRealtime, sb);
-                    Log.i(TAG, sb.toString());
-                } else {
-                    Log.w(TAG, "Read error: " + stats.mReadError);
-                }
-                i--;
+            ParcelFileDescriptor pfd = mProcessStats.getStatsOverTime(mDuration);
+            mStats = new ProcessStats(false);
+            InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(pfd);
+            mStats.read(is);
+            try {
+                is.close();
+            } catch (IOException e) {
             }
-            while (i >= 0) {
-                try {
-                    fds.get(i).close();
-                } catch (IOException e) {
-                }
-                i--;
+            if (mStats.mReadError != null) {
+                Log.w(TAG, "Failure reading process stats: " + mStats.mReadError);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException:", e);
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index 65fef80..3cd5406 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -16,12 +16,15 @@
 
 package com.android.settings.location;
 
+import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
@@ -40,6 +43,7 @@
  */
 public class RecentLocationApps {
     private static final String TAG = RecentLocationApps.class.getSimpleName();
+    private static final String ANDROID_SYSTEM_PACKAGE_NAME = "android";
 
     private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
 
@@ -165,10 +169,17 @@
         ArrayList<Preference> prefs = new ArrayList<Preference>();
         long now = System.currentTimeMillis();
         for (AppOpsManager.PackageOps ops : appOps) {
-            BatterySipperWrapper wrapper = sipperMap.get(ops.getUid());
-            Preference pref = getPreferenceFromOps(now, ops, wrapper);
-            if (pref != null) {
-                prefs.add(pref);
+            // Don't show the Android System in the list - it's not actionable for the user.
+            // Also don't show apps belonging to background users.
+            int uid = ops.getUid();
+            boolean isAndroidOs = (uid == Process.SYSTEM_UID)
+                    && ANDROID_SYSTEM_PACKAGE_NAME.equals(ops.getPackageName());
+            if (!isAndroidOs && ActivityManager.getCurrentUser() == UserHandle.getUserId(uid)) {
+                BatterySipperWrapper wrapper = sipperMap.get(uid);
+                Preference pref = getPreferenceFromOps(now, ops, wrapper);
+                if (pref != null) {
+                    prefs.add(pref);
+                }
             }
         }
 
@@ -261,7 +272,7 @@
                             " belongs to another inactive account, ignored.");
                 }
             } catch (PackageManager.NameNotFoundException e) {
-                Log.wtf(TAG, "Package not found: " + packageName);
+                Log.wtf(TAG, "Package not found: " + packageName, e);
             }
         }
 
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index d254842..49f0e65 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -65,6 +65,9 @@
     static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "add_printers_component_name";
     static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
 
+    private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME =
+            "EXTRA_PRINT_SERVICE_COMPONENT_NAME";
+
     private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
 
     private final Handler mHandler = new Handler() {
@@ -97,6 +100,7 @@
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
         mSettingsContentObserver.register(getContentResolver());
         updateServicesPreferences();
+        startPrintServiceSettingsIfNeeded();
         setHasOptionsMenu(true);
     }
 
@@ -213,6 +217,20 @@
         }
     }
 
+    private void startPrintServiceSettingsIfNeeded() {
+        if (getArguments() == null) {
+            return;
+        }
+        String componentName = getArguments().getString(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+        if (componentName != null) {
+            getArguments().remove(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+            Preference prereference = findPreference(componentName);
+            if (prereference != null) {
+                prereference.performClick(getPreferenceScreen());
+            }
+        }
+    }
+
     private class SettingsPackageMonitor extends PackageMonitor {
         @Override
         public void onPackageAdded(String packageName, int uid) {