diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a34479d..51ff2f2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -797,6 +797,7 @@
                 android:value="com.android.settings.NotificationStation" />
         </activity>
 
+        <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
                 android:taskAffinity=""
@@ -805,17 +806,15 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- Not yet ready to expose.
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
-                -->
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
-            <!--
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" /> -->
+                android:resource="@id/application_settings" />
         </activity>
+        -->
 
         <activity android:name="Settings$LocationSettingsActivity"
                 android:uiOptions="splitActionBarWhenNarrow"
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
index 470f5c0..de40bd0 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
index e3aa8db..73ebdb8 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
index 9e27d2f..e1d6138 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
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/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
index aa80a7c..79636c0 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
index e49e8a9..ac2c80a 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
index a54ecd0..87e21cc 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.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/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
index defdbb9..45d9301 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
index 582d0e1..35ae2c8 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
index 9732dd7..06419a1 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.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/bluetooth_access.xml b/res/layout/bluetooth_access.xml
index f398cef..7f42177 100644
--- a/res/layout/bluetooth_access.xml
+++ b/res/layout/bluetooth_access.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
-** Copyright 2009, The Android Open Source Project
+** Copyright 2011, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -35,15 +35,6 @@
             android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <CheckBox android:id="@+id/bluetooth_remember_choice"
-            style="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dip"
-            android:layout_marginBottom="20dip"
-            android:text="@string/bluetooth_remember_choice" />
-
     </LinearLayout>
 
 </ScrollView>
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
deleted file mode 100644
index 7f42177..0000000
--- a/res/layout/bluetooth_connection_access.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dip"
-            android:layout_marginEnd="20dip"
-            android:gravity="center_horizontal"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-</ScrollView>
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 26f27f3..9e23f33 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Toestelsensors"</string>
     <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>
@@ -1374,9 +1365,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>
-    <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="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,7 +1434,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>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Jou dokument kan deur een of meer bedieners op pad na die drukker gaan."</string>
+    <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>
@@ -1452,9 +1443,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>
-    <string name="print_searching_for_printers" msgid="4680248496457576358">"Soek vir drukkers"</string>
-    <string name="print_print_jobs" msgid="3582094777756968793">"Druktake"</string>
-    <string name="print_active_print_jobs" msgid="5055524262003598199">"Aktiewe druktake"</string>
+    <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tydsduur"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <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>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6340537..c7a472b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"የመሣሪያ ዳሳሾች"</string>
     <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>
@@ -1381,7 +1367,7 @@
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ሴኮንድ"</string>
     <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="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>
@@ -1544,10 +1530,15 @@
     <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>
-    <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_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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"የቆይታ ጊዜ"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ሰዓታት"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ሰዓታት"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓታት"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ቀን"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"በእጅ ማመሳሰል አልተቻለም"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fc53d49..d47281e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"أجهزة استشعار الجهاز"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"المدة"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ساعات"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ساعات"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
     <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>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3dc3ee0..3b5aac4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -546,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>
@@ -1043,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 />
@@ -1657,6 +1639,16 @@
     <skip />
     <!-- no translation found for services_subtitle (4296402367067266425) -->
     <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 61958dc..637f57c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Сензори на устройството"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Продължителност"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 часа"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 часа"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 часа"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ден"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не може да се синхронизира ръчно"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените настройката, временно включете данните на заден план и автоматичното синхронизиране."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 83cfa21..55d917d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensors del dispositiu"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durada"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hores"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <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>
@@ -1678,10 +1669,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>
@@ -1728,7 +1719,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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
@@ -1865,7 +1855,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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f48737f..aa15250d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -534,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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzory zařízení"</string>
     <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>
@@ -1374,8 +1365,8 @@
     <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>
-    <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_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>
@@ -1535,20 +1526,25 @@
     <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>
     <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">"Pozadí"</string>
-    <string name="process_stats_type_foreground" msgid="7713118254089580536">"Popředí"</string>
-    <string name="process_stats_type_cached" msgid="6314925846944806511">"Archiv"</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>
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Doba trvání"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodin"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodin"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 den"</string>
     <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">"Popředí"</string>
-    <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Archiv"</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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 76a63fc..12bec9c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhedssensorer"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighed"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <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>
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 de53d74..cc5efef 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -267,7 +267,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellung"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mehr..."</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>
@@ -1011,7 +1002,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Gerätesensoren"</string>
     <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>
@@ -1336,16 +1327,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>
@@ -1444,7 +1435,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>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Ihr Dokument kann bei der Übermittlung an den Drucker einen oder mehrere Server passieren."</string>
+    <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>
@@ -1453,7 +1444,7 @@
     <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>
-    <string name="print_searching_for_printers" msgid="4680248496457576358">"Suche nach Druckern..."</string>
+    <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>
@@ -1544,6 +1535,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Dauer"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 Stunden"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 Stunden"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 Stunden"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 Tag"</string>
     <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>
@@ -1767,9 +1763,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>
@@ -1788,7 +1784,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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 79f65ad..1671355 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Αισθητήρες συσκευής"</string>
     <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>
@@ -1537,18 +1528,23 @@
     <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_type_cached" msgid="6314925846944806511">"Αποθηκευμένο στην κρυφή μνήμη"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Αυτήν τη στιγμή η μνήμη της συσκευής είναι <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Διάρκεια"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ώρες"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ώρες"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ώρες"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ημέρα"</string>
     <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="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>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 98ca56e..3ec33ca 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Device sensors"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <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>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 98ca56e..3ec33ca 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Device sensors"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b10d81c..f8ad616 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -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 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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores del dispositivo"</string>
     <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>
@@ -1376,7 +1367,7 @@
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> seg"</string>
     <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> 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">"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>
@@ -1534,7 +1525,7 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"Aplicaciones <xliff:g id="TYPE">%1$s</xliff:g> de <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <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>
@@ -1543,9 +1534,14 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <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" 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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bf82fad..1eca175 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores del dispositivo"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <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>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 238cc93..df5963e 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Seadme andurid"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kestus"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 tundi"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 tundi"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 tundi"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 päev"</string>
     <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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0155cb3..a85801a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -630,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"حسگرهای دستگاه"</string>
     <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>
@@ -1480,7 +1466,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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"مدت"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"۳ ساعت"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"۶ ساعت"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعت"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"۱ روز"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"نمی‌توان به‌صورت دستی همگام‌سازی کرد"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"همگام‌سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر این تنظیم، داده‌های پس‌زمینه و همگام‌سازی خودکار را موقتاً روشن کنید."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
@@ -1977,7 +1967,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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 57bd9ba..07bb140 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -182,8 +182,7 @@
     <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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Välityspalvelin"</string>
     <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>
@@ -535,15 +534,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>
@@ -999,14 +989,10 @@
     <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>
-    <!-- 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="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilisopimus"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Oletusarvoinen tekstiviestisovellus"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vaihdetaanko tekstiviestisovellus?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Valitaanko tekstiviestisovellukseksi <xliff:g id="NEW_APP">%s</xliff:g> sovelluksen <xliff:g id="CURRENT_APP">%s</xliff:g> sijaan?"</string>
     <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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Laitteen anturit"</string>
     <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>
@@ -1561,6 +1547,11 @@
     <skip />
     <string name="process_stats_run_time" msgid="6520628955709369115">"Käyttöaika"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Palvelut"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kesto"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 tuntia"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 tuntia"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 tuntia"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 päivä"</string>
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
@@ -1780,8 +1771,7 @@
     <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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b6075f8..16eba5f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Capteurs de l\'appareil"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9c4c736..94466f6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Capteurs de l\'appareil"</string>
     <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>
@@ -1548,7 +1534,12 @@
     <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>
-    <string name="menu_show_system" msgid="8864603400415567635">"Afficher le système"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
+    <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 57473bc..011f542 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"उपकरण के सेंसर"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 घंटे"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 घंटे"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 घंटे"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 दिन"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7f499f2..0d5744b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzori uređaja"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 sata"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 sati"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 33c7c0e..eec4b66 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Az eszköz érzékelői"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Időtartam"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 óra"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 óra"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 óra"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 nap"</string>
     <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>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 4490098..42aedb0 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Սարքի սենսորները"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Տևողությունը"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ժամ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ժամ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ժամ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 օր"</string>
     <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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index dc06e25..fae0ddb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensor perangkat"</string>
     <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>
@@ -1090,7 +1076,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Harus membuat pola untuk membuka layar"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Perlihatkan pola"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Bergetar saat disentuh"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya mengunci dengan seketika"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya langsung kunci"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durasi"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 495af50..eb93c6e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -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,7 @@
     <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="7630170375010107744">"Piano dati mobili"</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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensori dispositivo"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durata"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 giorno"</string>
     <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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 27465ae..aeb9237 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"חיישני המכשיר"</string>
     <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>
@@ -1155,8 +1141,8 @@
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"הכל"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"מנוטרל"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"ההורדה בוצעה"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"פועל"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"הורדו"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"פועלות"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏אחסון USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
@@ -1379,9 +1365,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>
-    <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="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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"משך זמן"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 שעות"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 שעות"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"יום אחד"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"לא ניתן לסנכרן באופן ידני"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"אפשרות הסנכרון עבור פריט זה מושבתת כרגע. כדי לשנות את ההגדרה, הפעל באופן זמני את נתוני הרקע והסנכרון האוטומטי."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 15655ea..6ea84e4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -184,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -537,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>
@@ -655,7 +645,7 @@
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"無視してスキップ"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"スキップしない"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。\n\n端末のセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告: インターネットに接続しないと、タブレットはソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告: インターネットに接続しないと、携帯端末はソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -1001,14 +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>
-    <!-- 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="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>
@@ -1017,7 +1003,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"端末センサー"</string>
     <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>
@@ -1550,6 +1536,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3時間"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6時間"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1日"</string>
     <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>
@@ -1767,8 +1758,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 81609be..f7ca1d0 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"მოწყობილობის სენსორები"</string>
     <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>
@@ -1442,7 +1428,7 @@
     <string name="disable_service_message" msgid="2012273739481042318">"ღილაკზე OK შეხებით <xliff:g id="SERVICE">%1$s</xliff:g> გაჩერდება."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"სერვისები დაყენებული არ არის"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"გჭირდებათ ეკრანის წამკითხავი?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack უზრუნველყოფს გახმოვანებულ უკუკავშირს უსინათლო და დაქვეითებული მხედველობის მქონე მომხმარებლისთვის. გსურთ მისი უფასო ინსტალაცია Android Market-იდან?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack უზრუნველყოფს გახმოვანებულ უკუკავშირს უსინათლო და მცირე მხედველობის მომხმარებლისთვის. გსურთ მისი უფასო ინსტალაცია Android Market-იდან?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"აღწერა არ არის მოწოდებული."</string>
     <string name="settings_button" msgid="3006713718908152930">"პარამეტრები"</string>
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ხანგრძლივობა"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 საათი"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 საათი"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 საათი"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 დღე"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"შეუძლებელია ერთობლივი სინქრონიზაცია"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"სინქრონიზაცია გამორთულია. პარამეტრების შესაცვლელად დროებით ჩართეთ მონაცემების ფონური და ავტომატური სინქრონიზაცია."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f1145a3..b9a94db 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"ឧបករណ៍​ចាប់​សញ្ញា​របស់​ឧបករណ៍"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"រយៈពេល"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"៣ ម៉ោង"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"៦ ម៉ោង"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"១២ ម៉ោង"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"១ ថ្ងៃ"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម​ដោយ​ដៃ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"បច្ចុប្បន្ន​បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​សម្រាប់​​ធាតុ​នេះ។ ដើម្បី​ប្ដូរ​ការ​កំណត់​នេះ បើក​ទិន្នន័យ​​ផ្ទៃ​ខាង​ក្រោយ និង​ធ្វើ​សម​កាល​កម្ម​​ស្វ័យ​ប្រវត្តិ​ជា​បណ្ដោះអាសន្ន។"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c6c5fe6..11368d0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"기기 센서"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"기간"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3시간"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6시간"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12시간"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1일"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 이 설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 15f6012..ca20618 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"ອຸປະກອນເຊັນເຊີ"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ໄລຍະເວລາ"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ມື້"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນເອງໄດ້"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ການຊິ້ງຂໍ້ມູນຂອງລາຍການນີ້ຖືກປິດຢູ່. ເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້, ໃຫ້ເປິດການນຳໃຊ້ຂໍ້ມູນພື້ນຫຼັງ ແລະການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຊົ່ວຄາວ."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1dfd829..21685a7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Įrenginio jutikliai"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trukmė"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 val."</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 val."</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 val."</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 d."</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0409f48..f968c07 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Ierīces sensori"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ilgums"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 stundas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 stundas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 stundas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 diena"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index b114e57..93a1683 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Төхөөрөмжийн мэдрэгчид"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Үргэлжлэх хугацаа"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 цаг"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 цаг"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 цаг"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 өдөр"</string>
     <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>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 96596c3..5620905 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Penderia peranti"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tempoh"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b6be52c..7d33254 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhetssensorer"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighet"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"Én dag"</string>
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 651b95a..63b3d21 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Apparaatsensoren"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duur"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 uur"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 11ddac3..5508315 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Czujniki urządzenia"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Czas trwania"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 godziny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dzień"</string>
     <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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index bee81c7..0c7856e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -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>
@@ -1001,7 +992,7 @@
     <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 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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores do dispositivo"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ac42916..c274afd 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -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çõ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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores do dispositivo"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <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>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 56a3bb5..dc67360 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -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) -->
@@ -1559,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 />
@@ -2431,6 +2413,16 @@
     <skip />
     <!-- no translation found for services_subtitle (4296402367067266425) -->
     <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
@@ -3342,9 +3334,7 @@
     <skip />
     <!-- no translation found for wizard_finish (3286109692700083252) -->
     <skip />
-    <!-- no translation found for user_image_take_photo (1280274310152803669) -->
-    <!-- no translation found for user_image_take_photo (7496128293167402354) -->
-    <skip />
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Far ina foto"</string>
     <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
     <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 25ff124..1e8938a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzorii dispozitivului"</string>
     <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>
@@ -1549,6 +1535,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durată"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"O zi"</string>
     <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>
@@ -1762,8 +1753,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dbd52de..379f1ea 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Датчики устройства"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Период"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ч."</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ч."</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ч."</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 д."</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Не удалось синхронизировать данные"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизация отключена. Чтобы включить ее, временно разрешите передачу данных в фоновом режиме и автоматическую синхронизацию."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 00bb1cc..96d94e4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -534,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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Zariadenie sníma"</string>
     <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>
@@ -1543,8 +1534,13 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trvanie"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 deň"</string>
     <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ť sady)"</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>
@@ -1817,8 +1813,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesov na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobraziť všetky ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobraziť dialóg Aplikácia neodpovedá pre aplikácie na pozadí"</string>
-    <string name="experimental_webview" msgid="4492200819033780927">"Použiť skúšob. zobr. webu"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikácie použijú najnov. zobr. webu (beta)"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Experimentálne WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikácie použijú najnovšie WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátové služby pri roamingu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 17899cd..7b85551 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Tipala naprave"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <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>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 35c2832..5e5e560 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Сензори за уређаје"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Трајање"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 сата"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 сати"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 сати"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 дан"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Ручно синхронизовање није могуће"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили ово подешавање, привремено укључите позадинске податке и аутоматску синхронизацију."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 63b5262..a902f36 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -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">"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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhetssensorer"</string>
     <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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Längd"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timmar"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timmar"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timmar"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <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>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ba5f731..0b580e1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -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>
@@ -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>
@@ -822,7 +813,7 @@
     <string name="status_data_state" msgid="5503181397066522950">"Hali ya mtandao wa simu ya mkononi"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hali ya huduma"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Nguvu za mawimbi"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"Urandaji"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"Uko nje ya mtandao wako wa kawaida"</string>
     <string name="status_operator" msgid="2274875196954742087">"Mtandao"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Anwani ya Wi-Fi ya MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
@@ -990,7 +981,7 @@
     <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="7630170375010107744">"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>
@@ -1004,7 +995,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensa za Kifaa"</string>
     <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>
@@ -1017,7 +1008,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>
@@ -1155,8 +1146,8 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hifadhi ya kadi ya SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Kiwango cha kukadiria upya"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Futa data za programu?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Data hizi zote za programu zitafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na kuendelea."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ungependa kufuta data ya programu?"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Data hii yote ya programu itafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na nyingineyo."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Sawa"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Ghairi"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1437,7 +1428,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>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Hati yako inaweza kupita kwa seva moja au zaidi inapotumwa kwa printa."</string>
+    <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>
@@ -1528,20 +1519,25 @@
     <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>
-    <string name="process_stats_total_duration" msgid="1869761515101180444">"<xliff:g id="TYPE">%1$s</xliff:g> programu kwa <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <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 kutoka mbele"</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>
-    <string name="process_stats_avg_ram_use" msgid="6972943528929394396">"Wastani wa matumizi ya RAM"</string>
+    <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Muda"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"Saa 3"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"Saa 6"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"Siku 1"</string>
     <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 kutoka mbele"</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>
@@ -1641,7 +1637,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>
@@ -1667,12 +1663,12 @@
     <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="untitled_apn" msgid="1230060359198685513">"Haina Kichwa"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Mlio na mtetemo wa simu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index baf16af..4a37a6a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"เซ็นเซอร์ของอุปกรณ์"</string>
     <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>
@@ -1379,9 +1365,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>
-    <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="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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ระยะเวลา"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ชั่วโมง"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ชั่วโมง"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ชั่วโมง"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 วัน"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 68c9cf0..21e2303 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Mga sensor ng device"</string>
     <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>
@@ -1548,9 +1534,14 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tagal"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 oras"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 na oras"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 oras"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 araw"</string>
     <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 istatistika"</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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a65b2d4..8970407 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Cihaz sensörleri"</string>
     <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>
@@ -1539,7 +1525,7 @@
     <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>
-    <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> uygulama"</string>
+    <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>
@@ -1548,7 +1534,12 @@
     <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>
-    <string name="menu_show_system" msgid="8864603400415567635">"Sistemi göster"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Süre"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 saat"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 saat"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 saat"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 gün"</string>
+    <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1c961bb..f837834 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -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>
@@ -1010,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Датчики пристрою"</string>
     <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>
@@ -1374,7 +1365,7 @@
     <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>
-    <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_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>
@@ -1543,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Тривалість"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 години"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 годин"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 годин"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 день"</string>
     <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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7b3bd21..0a51450 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Cảm biến thiết bị"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Thời lượng"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 giờ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 giờ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 giờ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ngày"</string>
     <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>
@@ -1761,8 +1752,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>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8f7d5e5..eba5c95 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"设备传感器"</string>
     <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>
@@ -1539,15 +1525,20 @@
     <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>
-    <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_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>
     <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_max_ram_use" msgid="3273876448926689261">"RAM 最高使用率"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服务"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"时间长度"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3小时"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6小时"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12小时"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1天"</string>
     <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>
@@ -1761,8 +1752,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"无法手动同步"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"目前，此条目的同步功能已停用。要更改此设置，请暂时启用后台数据和自动同步功能。"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d284e41..634b1c1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"裝置感應器"</string>
     <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>
@@ -1448,7 +1434,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>
-    <string name="print_service_security_warning_summary" msgid="7567131958613064363">"您的文件可能會通過一台或多台伺服器才傳送至打印機。"</string>
+    <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"持續時間"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <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>
@@ -1765,8 +1756,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要更改此設定，請暫時開啟背景資料與自動同步處理功能。"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 69c17b4..8c5eae4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -182,8 +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>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <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>
@@ -535,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>
@@ -999,14 +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>
-    <!-- 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="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>
@@ -1015,7 +1001,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"裝置感應器"</string>
     <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>
@@ -1548,6 +1534,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"時間長度"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <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>
@@ -1765,8 +1756,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要變更這項設定，請暫時開啟背景資料與自動同步處理功能。"</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 622c964..041f2df 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -534,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>
@@ -1011,7 +1002,7 @@
     <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>
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Izinzwa zedivayisi"</string>
     <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>
@@ -1550,6 +1541,11 @@
     <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>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ubude besikhathi"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 amahora"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 amahora"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 amahora"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 usuku"</string>
     <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>
@@ -1951,9 +1947,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>
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/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 9269b27..52706a1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -326,9 +326,7 @@
         Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
         if (selectRuntime != null) {
             mAllPrefs.add(selectRuntime);
-            if (!removePreferenceForProduction(selectRuntime)) {
-                filterRuntimeOptions(selectRuntime);
-            }
+            filterRuntimeOptions(selectRuntime);
         }
 
         Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 5c77a97..ac67a38 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -667,50 +667,15 @@
         return headerIndex;
     }
 
-    private boolean isSystemApp(ResolveInfo ri) {
-        return ((ri.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-    }
-
     private boolean updateHomeSettingHeaders(Header header) {
-        final PackageManager pm = getPackageManager();
-        final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
         try {
-            ComponentName currentHome = pm.getHomeActivities(homeApps);
+            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;
             }
-            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");
-            }
         } 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);
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/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/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 012aff0..e73857a 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -55,8 +55,6 @@
     private String mReturnPackage = null;
     private String mReturnClass = null;
 
-    private CheckBox mRememberChoice;
-    private boolean mRememberChoiceValue = false;
     private int mRequestType = 0;
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -156,64 +154,50 @@
         return mRemoteName;
     }
 
+    // TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView
+    // are similar. Refactor them into one method.
+    // Also, the string resources bluetooth_remember_choice and bluetooth_pb_remember_choice should
+    // be removed.
     private View createConnectionDialogView() {
         String mRemoteName = createRemoteName();
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
         messageView.setText(getString(R.string.bluetooth_connection_dialog_text,
                 mRemoteName));
         return mView;
     }
 
-    private void createCheckbox(int viewId)
-    {
-        mRememberChoice = (CheckBox)mView.findViewById(viewId);
-        mRememberChoice.setChecked(false);
-        mRememberChoice.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mRememberChoiceValue = true;
-                } else {
-                    mRememberChoiceValue = false;
-                }
-            }
-            });
-    }
     private View createPhonebookDialogView() {
         String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
         messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
                 mRemoteName, mRemoteName));
-        createCheckbox(R.id.bluetooth_remember_choice);
         return mView;
     }
+
     private View createMapDialogView() {
         String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
         messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text,
                 mRemoteName, mRemoteName));
-        createCheckbox(R.id.bluetooth_remember_choice);
         return mView;
     }
 
     private void onPositive() {
-        if (DEBUG) Log.d(TAG, "onPositive mRememberChoiceValue: " + mRememberChoiceValue);
-        if (mRememberChoiceValue)
-            savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_ALLOWED);
-
+        if (DEBUG) Log.d(TAG, "onPositive");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_ALLOWED);
+        // TODO(edjee): Now that we always save the user's choice,
+        // we can get rid of BluetoothDevice#EXTRA_ALWAYS_ALLOWED.
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
-                            BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
+                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
         finish();
     }
 
     private void onNegative() {
-        if (DEBUG) Log.d(TAG, "onNegative mRememberChoiceValue: " + mRememberChoiceValue);
-
-        if (mRememberChoiceValue)
-            savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_REJECTED);
-
+        if (DEBUG) Log.d(TAG, "onNegative");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_UNKNOWN);
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, false,
                              null, false // dummy value, no effect since last param is null
                              );
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) {