diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 033208b..6f4bf10 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -39,6 +39,10 @@
                     android:text="@string/no_applications"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
         </FrameLayout>
+        <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+             any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+             Please also note the left/right gravities that would also need to be changed for proper
+             RTL support -->
         <view class="com.android.settings.applications.LinearColorBar"
                 android:id="@+id/storage_color_bar"
                 android:layout_marginStart="@dimen/settings_side_margin"
@@ -50,11 +54,13 @@
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:paddingTop="30dp"
-                android:paddingBottom="1dp">
+                android:paddingBottom="1dp"
+                android:layoutDirection="ltr">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:gravity="left"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -75,7 +81,7 @@
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="right"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 41ace43..3a2552f 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -37,6 +37,10 @@
                 android:text="@string/no_running_services"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
     </FrameLayout>
+    <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+         any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+         Please also note the left/right gravities that would also need to be changed for proper
+         RTL support -->
     <view class="com.android.settings.applications.LinearColorBar"
             android:id="@+id/color_bar"
             android:layout_marginStart="@dimen/settings_side_margin"
@@ -50,13 +54,14 @@
             android:paddingTop="30dp"
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
-            android:paddingBottom="1dp">
+            android:paddingBottom="1dp"
+            android:layoutDirection="ltr">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="start|bottom"
+            android:gravity="left|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
@@ -78,7 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="end|bottom"
+            android:gravity="right|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index a2146c6..002a640 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -82,7 +82,8 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:password="true"
-                    android:maxLength="63" />
+                    android:maxLength="63"
+                    android:imeOptions="flagForceAscii" />
 
             <TextView android:id="@+id/hint"
                     style="?android:attr/textAppearanceSmall"
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
index cb9071c..a9a4aed 100644
--- a/res/menu/print_service_settings.xml
+++ b/res/menu/print_service_settings.xml
@@ -20,17 +20,17 @@
         android:title="@string/print_menu_item_search"
         android:icon="@*android:drawable/ic_menu_search_holo_dark"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom"
+        android:showAsAction="ifRoom|collapseActionView"
         android:imeOptions="actionSearch">
     </item>
     <item
         android:id="@+id/print_menu_item_add_printer"
         android:title="@string/print_menu_item_add_printer"
-        android:showAsAction="ifRoom">
+        android:showAsAction="never">
     </item>
     <item
         android:id="@+id/print_menu_item_settings"
         android:title="@string/print_menu_item_settings"
-        android:showAsAction="ifRoom">
+        android:showAsAction="never">
     </item>
 </menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 712f3ab..d2dca44 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Net 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="7156440988150119767">"Geen programme het die ligging in die laaste 15 minute aangevra nie."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Liggingdienste"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Geen programme het onlangs ligging versoek nie"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Programinstellings"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoë batterygebruik"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lae batterygebruik"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Liggingmodus"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Druk"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Druk-instellings"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan dokumente ontvang wat jy druk. Sulke dokumente kan sensitiewe inligting bevat."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Voeg drukkers by"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Af"</string>
+    <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="category_printers" msgid="4345417708283144981">"Drukkers"</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>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Berginggebruik"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistieke oor <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Toestelberging is tans <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Gemiddelde RAM-gebruik"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Looptyd"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Steminvoering en -uitvoering"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Steminvoering- en -uitvoeringsinstellings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemsoektog"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 393dc17..1442a9b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"የመሣሪያ ዳሳሽ አካላት ብቻ"</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="7156440988150119767">"ባለፉት 15 ደቂቃዎች ውስጥ ምንም መተግበሪያዎች አካባቢ አልጠየቁም።"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"የአካባቢ አገልግሎቶች"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"የመተግበሪያ ቅንብሮች"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ከፍተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ዝቅተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"የአካባቢ ሁነታ"</string>
@@ -1363,8 +1364,8 @@
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ፍርግሞች እንዲፈጥርና ውሂባቸውን እንዲደርስ ሁልጊዜ ፍቀድ"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ቀኖች<xliff:g id="HOURS">%2$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%3$d</xliff:g> ደቂቃዎች<xliff:g id="SECONDS">%4$d</xliff:g> ሰከንዶች"</string>
     <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_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="usage_stats_label" msgid="5890846333487083609">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"የአጠቃቀም ስታስቲክስ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ለይ በ:"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
     <string name="settings_button" msgid="3006713718908152930">"ቅንብሮች"</string>
     <string name="print_settings" msgid="4742428530112487843">"ማተም"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"የህትመት ቅንብሮች"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"አገልግሎቶች"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> የሚያትሟቸውን ሰነዶች መቀበል ይችላል። እንደዚህ ያሉ ሰነዶች ሚስጥራዊ ውሂብ ሊይዙ ይችላሉ።"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"አታሚዎችን ያክሉ"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"በርቷል"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ጠፍቷል"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"አገልግሎት አክል"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"አታሚ ያክሉ"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"ፍለጋ"</string>
+    <string name="category_printers" msgid="4345417708283144981">"አታሚዎች"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ባትሪ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ባትሪውን ምን እየተጠቀመበት ነበር"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"የባትሪ አጠቃቀም ውሂብ የለም።"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"የማህደረ ትውስታ አጠቃቀም"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"በ<xliff:g id="TIME">%1$s</xliff:g> ላይ የነበረ ስታቲስቲክስ"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"የመሣሪያው ማህደረ ትውስታ በአሁኑ ጊዜ <xliff:g id="MEMSTATE">%1$s</xliff:g> ነው"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"አማካይ የRAM አጠቃቀም"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"የሚቆይበት ጊዜ ርዝመት"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"የድምፅ ግቤት &amp; ውፅአት"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"የድምፅ ግቤት &amp; ውፅአት ቅንብሮች"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"የድምፅ ፍለጋ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c156d92..1e63dfd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"أجهزة استشعار الجهاز فقط"</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="7156440988150119767">"لم تطلب أي تطبيقات الموقع في آخر 15 دقيقة."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"خدمات الموقع"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"لم تطلب أي تطبيقات الوصول إلى الموقع مؤخرًا"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"إعدادات التطبيق"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"استخدام عالٍ للبطارية"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"استخدام منخفض للبطارية"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"وضع الموقع"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
     <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
     <string name="print_settings" msgid="4742428530112487843">"الطباعة"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"إعدادات الطباعة"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"الخدمات"</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="919299459931111450">"يمكن أن تستلم <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> مستندات تطبعها. قد تحتوي هذه المستندات على بيانات مهمة."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"إضافة طابعات"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"تشغيل"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"إيقاف"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"إضافة خدمة"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"إضافة طابعة"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"بحث"</string>
+    <string name="category_printers" msgid="4345417708283144981">"طابعات"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"البطارية"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ما الذي كان يستخدم البطارية"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"بيانات استخدام البطارية غير متاحة."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"استخدام الذاكرة"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"الإحصائيات على مدار <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ذاكرة الجهاز حاليًا <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"متوسط ​​استخدام ذاكرة الوصول العشوائي"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"مدة التشغيل"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"الخدمات"</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-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index f40fa33..78c447d 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -536,6 +536,7 @@
     <string name="wifi_display_autonomous_go" msgid="140864379216673466">"Avtonom GO aktivləşdirin"</string>
     <string name="wifi_display_pause" msgid="6037110530682927245">"Pauza"</string>
     <string name="wifi_display_resume" msgid="8195590160258469425">"Davam edin"</string>
+    <string name="wifi_display_wps_config" msgid="7566565571340705772">"WPS konfiqurasiyası"</string>
     <string name="wifi_display_listen_channel" msgid="4146320990898147857">"Kanalı dinləyin"</string>
     <string name="wifi_display_operating_channel" msgid="233535284689144515">"Əməliyyat kanalı"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Yalnız cihaz sensorları"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Məkan deaktiv"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son məkan sorğuları"</string>
-    <string name="location_no_recent_apps" msgid="7156440988150119767">"Son 15 dəqiqə ərzində heç bir tətbiq məkan sorğusu göndərməyib."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Məkan xidmətləri"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Son vaxtlar heç bir tətbiq tərəfindən məkan sorğusu olmayıb"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Tətbiq ayarları"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Çox batareya istifadəsi"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Az batareya istifadəsi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Məkan rejimi"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Heç bir təsvir verilməyib."</string>
     <string name="settings_button" msgid="3006713718908152930">"Parametrlər"</string>
     <string name="print_settings" msgid="4742428530112487843">"Çap"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Çap ayarları"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Xidmətlər"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Çap xidmətləri"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətindən istifadə edilsin?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> çap etdiyiniz sənədləri qəbul edə bilər. Belə sənədlər konfidensial məlumatlardan ibarət ola bilər."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Heç bir xidmət quraşdırılmayıb"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printer əlavə edin"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Aktiv"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Deaktiv"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Xidmət əlavə et"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Printer əlavə edin"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Axtarış"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printerlər"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batareya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Nə batareya işlədir"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batareya istifadə datası əlçatımlı deyil."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Yaddaş istifadəsi"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> sonrası statistika"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Cari cihaz yaddaşı: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Orta RAM istifadəsi"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"İşləmə müddəti"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Xidmətlər"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Səs girişi və çıxışı"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Səs daxiletməsi və çıxış parametrləri"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Səsli axtarış"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7c38708..6c01b38 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -548,6 +548,8 @@
     <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) -->
@@ -1029,9 +1031,9 @@
     <skip />
     <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
     <skip />
-    <!-- no translation found for location_no_recent_apps (7156440988150119767) -->
+    <!-- no translation found for location_no_recent_apps (2800907699722178041) -->
     <skip />
-    <!-- no translation found for location_category_location_services (7437150886946685979) -->
+    <!-- no translation found for location_category_app_settings (46434611182743486) -->
     <skip />
     <!-- no translation found for location_high_battery_use (517199943258508020) -->
     <skip />
@@ -1503,9 +1505,7 @@
     <string name="settings_button" msgid="3006713718908152930">"Налады"</string>
     <!-- no translation found for print_settings (4742428530112487843) -->
     <skip />
-    <!-- no translation found for print_settings_title (4911263339115736689) -->
-    <skip />
-    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <!-- no translation found for print_settings_title (3685449667822217816) -->
     <skip />
     <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
     <skip />
@@ -1521,6 +1521,14 @@
     <skip />
     <!-- no translation found for print_feature_state_off (7294876968403966040) -->
     <skip />
+    <!-- no translation found for print_menu_item_add_service (3811645167869797802) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printer (8251218970577291032) -->
+    <skip />
+    <!-- no translation found for print_menu_item_search (7025589328240514553) -->
+    <skip />
+    <!-- no translation found for category_printers (4345417708283144981) -->
+    <skip />
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарэя"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На што расходуецца акумулятар"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Адсутнiчаюць дадзеныя пра выкарыстанне акумулятара."</string>
@@ -1607,6 +1615,12 @@
     <skip />
     <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
     <skip />
+    <!-- no translation found for process_stats_ram_use (1271366870003042708) -->
+    <skip />
+    <!-- no translation found for process_stats_run_time (6520628955709369115) -->
+    <skip />
+    <!-- no translation found for services_subtitle (4296402367067266425) -->
+    <skip />
     <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-bg/strings.xml b/res/values-bg/strings.xml
index 1b10ef5..33a9529 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензорите на устройството"</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="7156440988150119767">"Нито едно приложение не е заявило достъп до местоположението през последните 15 минути."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Услуги за местоположение"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Настройки за приложения"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Висок разход на батерията"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Нисък разход на батерията"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим за местоположението"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Настройки за отпечатване"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Услуги"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да получава отпечатваните от вас документи. Възможно е те да съдържат поверителни данни."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавяне на принтери"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Включено"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Изключено"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Добавяне на услуга"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Добавяне на принтер"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Търсене"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Принтери"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерия"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Какво е използвало батерията"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Няма данни за употр. на батерията."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Използвана памет"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Статистически данни за <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Понастоящем състоянието на паметта на устройството е <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Средно използване на паметта"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Време на използване"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Услуги"</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-ca/strings.xml b/res/values-ca/strings.xml
index dd2f195..7f1ecb0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -32,8 +32,8 @@
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIU"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
     <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
-    <string name="turn_on_radio" msgid="8706561489788373676">"Activa la ràdio"</string>
-    <string name="turn_off_radio" msgid="1820294552893884115">"Desactiva la ràdio"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"Activa el senyal mòbil"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Desactiva el senyal mòbil"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activa SMS a través d\'IMS"</string>
     <string name="sms_over_ims_off" msgid="8354792045992793959">"Desactiva SMS a través d\'IMS"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"És necessari activar el registre de MI"</string>
@@ -47,7 +47,7 @@
     <string name="radioInfo_service_in" msgid="1915416319177520020">"En servei"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Sense servei"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Només trucades d\'emergència"</string>
-    <string name="radioInfo_service_off" msgid="1434084741785525415">"Ràdio desactivada"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Senyal mòbil desactivat"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Itinerància"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"No està en itinerància"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Absent"</string>
@@ -138,13 +138,13 @@
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"S\'està connectant…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està sincronitzant..."</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està emparellant..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Dispositiu Bluetooth sense nom"</string>
     <string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No s\'ha trobat cap dispositiu Bluetooth a prop."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud de sincronització de Bluetooth"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud de sincronització"</string>
-    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca per sincronitzar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud d\'emparellament de Bluetooth"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud d\'emparellament"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca per emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
@@ -215,10 +215,10 @@
     <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Intensitat del senyal:"</string>
     <string name="radio_info_call_status_label" msgid="4896238900685510883">"Estat de la trucada:"</string>
     <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP enviat:"</string>
-    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Restabliments de la ràdio:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Restabliments del senyal mòbil:"</string>
     <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Espera de missatges:"</string>
     <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Número de telèfon:"</string>
-    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Selecciona la banda de ràdio"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Selecciona la banda de senyal mòbil"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Tipus de xarxa:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Defineix el tipus de xarxa preferida:"</string>
     <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping d\'adreça IP:"</string>
@@ -438,24 +438,24 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activa el Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestiona les connexions, defineix el nom i la detecció del dispositiu"</string>
-    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Sol·licitud de sincronització de Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Per enllaçar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu el PIN que el dispositiu sol·licita:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per sincronitzar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu la contrasenya que requereix el dispositiu:"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestiona les connexions, defineix el nom i la visibilitat del dispositiu"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Sol·licitud d\'emparellament de Bluetooth"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Per emparellar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu el PIN sol·licitat pel dispositiu:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Per emparellar amb:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu la contrasenya que requereix el dispositiu:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN conté lletres o símbols"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"En general, 0000 o 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Pot ser que també hagis d\'introduir aquesta contrasenya a l\'altre dispositiu."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per sincronitzar  amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assegura\'t que apareix aquesta contrasenya:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols sincronitzar  amb aquest dispositiu?"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Per emparellar amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assegura\'t que apareix aquesta contrasenya:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols emparellar-lo amb aquest dispositiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Per sincronitzar amb:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escriu-hi:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> i, a continuació, prem la tecla de retorn."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronitza"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut sincronitzar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut sincronitzar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, perquè el PIN o la contrasenya són incorrectes."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut emparellar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, perquè el PIN o la contrasenya són incorrectes."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No es pot comunicar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronització rebutjada per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparellament rebutjat per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No s\'ha pogut connectar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cerca dispositius"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Cerca dispositius"</string>
@@ -465,7 +465,7 @@
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositius disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Connecta"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconnecta"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sincronitza i connecta"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Emparella i connecta"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Dessincronitza"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconnecta i dessincronitza"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcions…"</string>
@@ -504,7 +504,7 @@
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús del connector per a l\'àudio"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús de la base per a àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
@@ -536,6 +536,7 @@
     <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>
@@ -695,7 +696,7 @@
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"To del telèfon"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
@@ -703,44 +704,44 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"So de notificació predeterminat"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació"</string>
-    <string name="incoming_call_volume_title" msgid="8073714801365904099">"To"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"So de trucada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilitza el volum de trucada entrant per a les notificacions"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"So de notificació predeterminat"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multimèdia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Defineix el volum de la música i els vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Configuració d\'àudio del connector adjunt"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Configuració d\'àudio de la base adjunta"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"So en marcar el número"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"So en tocar"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"So de bloqueig de pantalla"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar en tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancel·lació de sorolls"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Música, vídeos, jocs i altres fitxers multimèdia"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"To i notificacions"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"So de trucada i notificacions"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Notificacions"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Silencia els tons i les notificacions"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Silencia els sons i les notificacions"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Silencia la música i altres fitxers multimèdia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silencia les notificacions"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silencia les alarmes"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar en sonar"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"Connector"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Configuració del connector"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Configuració de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Àudio"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configuració de la base d\'escriptori connectada"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuració del connector del cotxe adjunt"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tauleta no acoblada"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configuració de la base d\'escriptori"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuració de la base del vehicle"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tauleta no connectada"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telèfon no connectat"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració del connector adjunt"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat el connector"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"So en inserir el connector"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta del connector"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix so en inserir o treure el telèfon del connector"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta del connector"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon del connector"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració de la base adjunta"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat la base"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Per configurar l\'àudio de la base, has de connectar-hi la tauleta."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Per configurar l\'àudio de la base, has de connectar-hi el telèfon."</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"So en inserir a la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta de la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix so en inserir o treure el telèfon de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
@@ -757,7 +758,7 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Estalvi de pantalla"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui en un connector o inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui connectat a una base o inactiu i carregant-se"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Els dos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quan el dispositiu estigui en un connector"</string>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Només sensors de 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="7156440988150119767">"No hi ha cap aplicació que hagi sol·licitat la ubicació els últims 15 minuts."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Serveis d\'ubicació"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Cap aplicació ha sol·licitat la ubicació recentment"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Configuració de l\'aplicació"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Ús de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Ús de bateria reduït"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressió"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Configuració d\'impressió"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Serveis"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Serveis d\'impressió"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pot rebre els documents que imprimeixis. És possible que aquests documents continguin dades confidencials."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Afegeix impressores"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Activat"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Desactivat"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Afegeix un servei"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Afegeix una impressora"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Cerca"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Impressores"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dades d\'ús de bateria no disp."</string>
@@ -1494,7 +1498,7 @@
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilitzada per les trucades de veu"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilitzada quan la tauleta estigui inactiva"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilitzada quan el telèfon està inactiu"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilitzada per la ràdio de cel·la"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilitzada pel senyal mòbil"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Canvia al mode d\'avió per estalviar energia en zones sense cobertura de telefonia mòbil"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilitzada per la pantalla i la retroil·luminació"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Redueix la brillantor i/o el temps d\'espera de la pantalla"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Ús de la memòria"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estadístiques durant <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En aquests moments la memòria del dispositiu és <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Ús mitjà 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="voice_input_output_settings" msgid="1336135218350444783">"Entrada i sortida de veu"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuració d\'entrada i sortida de veu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Cerca per veu"</string>
@@ -1651,7 +1658,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Sense títol"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificacions"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"To de trucada i vibració"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"So de trucada i vibració"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Configuració de Wi-Fi"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Connexió a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c73aabb..212376f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Pouze 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č. polohy"</string>
-    <string name="location_no_recent_apps" msgid="7156440988150119767">"Během posledních 15 minut žádné aplikace o polohu nepožádaly."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Služby určování polohy"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslední době žádné aplikace o polohu nepožádaly."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Nastavení aplikací"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoké využití baterie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízké využití baterie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určování polohy"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tisk"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Nastavení tisku"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Tiskové služby"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Chcete použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> může přijímat dokumenty, které tisknete. Tyto dokumenty mohou obsahovat citlivá data."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Přidat tiskárny"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuto"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuto"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Přidat službu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Přidat tiskárnu"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Vyhledávání"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Tiskárny"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotřebě nejsou známy."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiky jsou ukončeny <xliff:g id="TIME">%1$s</xliff:g>"</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_ram_use" msgid="1271366870003042708">"Průměrné 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="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 7b98645..64f8d91 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Kun enhedens sensorer"</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="7156440988150119767">"Ingen apps har anmodet om placering inden for de sidste 15 minutter."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Placeringstjenester"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apps har anmodet om placering for nylig"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Appindstillinger"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lavt batteriforbrug"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Placeringstilstand"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
     <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
     <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Indstillinger for udskrivning"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Udskrivningstjenester"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan modtage dokumenter, du udskriver. Sådanne dokumenter kan indeholde følsomme oplysninger."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tilføj printere"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Til"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Fra"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tilføj tjeneste"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tilføj printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Søg"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printere"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hvad der har brugt batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribrugsdata utilgængeligt."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistikker over <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhedens hukommelse er i øjeblikket <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Gennemsnitligt RAM-forbrug"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Visningstid"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Stemmeinput og -output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Indstillinger for stemmeinput og -output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemmesøgning"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9e18c3c..440e364 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -114,7 +114,7 @@
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sichtbarkeit einstellen"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-Geräte"</string>
@@ -138,7 +138,7 @@
     <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbindung wird getrennt..."</string>
     <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbindung wird hergestellt..."</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Kopplung läuft…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Suche läuft"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Kein Bluetooth-Gerät in der Nähe gefunden"</string>
@@ -537,6 +537,7 @@
     <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>
@@ -567,7 +568,7 @@
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Erkennungsfunktion immer verfügbar"</string>
-    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen."</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
     <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Zur Erhöhung der Standortgenauigkeit und aus anderen Gründen können Google und andere Apps auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
     <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps können auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
@@ -676,7 +677,7 @@
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Nach Geräten suchen"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Suche läuft…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Gerät umbenennen"</string>
-    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-Geräte"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Verfügbare Geräte"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Gespeicherte Gruppen"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Verbindung nicht möglich"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gerät konnte nicht umbenannt werden."</string>
@@ -746,7 +747,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Suche"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
     <string name="display_settings" msgid="7965901687241669598">"Display"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Display autom. drehen"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Display automatisch drehen"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
@@ -1005,8 +1006,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Nur 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="7156440988150119767">"In den letzten 15 Minuten wurde der Standort von keiner App abgerufen."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Standortdienste"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Keine App hat kürzlich den Standort abgefragt."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"App-Einstellungen"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoher Akkuverbrauch"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Geringer Akkuverbrauch"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Standortmodus"</string>
@@ -1135,7 +1136,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstell. zurücksetzen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dadurch werden alle Einstellungen zurückgesetzt für:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n" "<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n" Alle App-Daten bleiben erhalten."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dies wird die folgenden Einstellungen zurücksetzen:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für bestimmte Aktionen"</li>\n" "<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n" "<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n" Alle App-Daten bleiben erhalten."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1430,8 +1431,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drucken"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Druckeinstellungen"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kann Ihre Druckdokumente empfangen. Diese Dokumente können vertrauliche Daten enthalten."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
@@ -1439,6 +1439,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Drucker hinzufügen"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"An"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Aus"</string>
+    <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="category_printers" msgid="4345417708283144981">"Drucker"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Keine Daten zum Akkuverbrauch"</string>
@@ -1520,6 +1524,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Speichernutzung"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiken für <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Der aktuelle Speicherstand des Geräts ist <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Durchschnittliche RAM-Nutzung"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Laufzeit"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Spracheingabe&amp;-ausgabe"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Einstellungen für Spracheingabe &amp; -ausgabe"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Sprachsuche"</string>
@@ -1600,7 +1607,7 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zertifikate von SD-Karte installieren"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauensw. Anmeldedaten"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauenswürdige Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate ansehen"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Speichertyp"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
@@ -1974,7 +1981,7 @@
     <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen."</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen"</string>
     <string name="user_restrictions_title" msgid="7745810037152772035">"Beschränkungen für Apps und Inhalte"</string>
     <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"App-Beschränkungen festlegen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4cae1fd..1f9f3ab 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Μόνο αισθητήρες συσκευής"</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="7156440988150119767">"Καμία εφαρμογή δεν ζήτησε πληροφορίες τοποθεσίας τα τελευταία 15 λεπτά."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Υπηρεσίες τοποθεσίας"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Καμία εφαρμογή δεν ζήτησε πρόσφατα την τοποθεσία σας."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Ρυθμίσεις εφαρμογής"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Υψηλή χρήση μπαταρίας"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Χαμηλή χρήση μπαταρίας"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Λειτουργία τοποθεσίας"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
     <string name="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Ρυθμίσεις εκτύπωσης"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Υπηρεσίες"</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="919299459931111450">"Η υπηρεσία <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> μπορεί να λάβει τα έγγραφα που εκτυπώνετε. Τα έγγραφα αυτού του είδους ενδέχεται να περιέχουν ευαίσθητα δεδομένα."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Προσθήκη εκτυπωτών"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Ενεργό"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Ανενεργό"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Προσθήκη υπηρεσίας"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Προσθήκη εκτυπωτή"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Αναζήτηση"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Εκτυπωτές"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Μπαταρία"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Τι χρησιμοποιούσε την μπαταρία"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Μη διαθέσιμα δεδ. χρήσ. μπατ."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Χρήση μνήμης"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Στατιστικά στοιχεία για <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Αυτήν τη στιγμή η μνήμη της συσκευής είναι <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Μέση χρήση RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Χρόνος εκτέλεσης"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Υπηρεσίες"</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 dd6c97a..b696d7d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Device sensors only"</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="7156440988150119767">"No apps have requested location in the last 15 minutes."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"App settings"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Printing settings"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> can receive documents you print. Such documents may contain sensitive data."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Add printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Search"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printers"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Stats over <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Average RAM use"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Voice input &amp; output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index dd6c97a..b696d7d 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Device sensors only"</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="7156440988150119767">"No apps have requested location in the last 15 minutes."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"App settings"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Low battery use"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Location mode"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Printing settings"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> can receive documents you print. Such documents may contain sensitive data."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Add printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Search"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printers"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Stats over <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Device memory is currently <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Average RAM use"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Voice input &amp; output"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e7b8ba9..d5e21df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo 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="7156440988150119767">"Ninguna aplicación solicitó la ubicación durante los últimos 15 minutos."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación solicitó la ubicación recientemente."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Configuración de la aplicación"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería alto"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Uso de batería bajo"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impresión"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Estos documentos pueden contener información confidencial."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Agregar impresoras"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Sí"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"No"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Agregar servicio"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Agregar impresora"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Impresoras"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Sin datos de uso de batería"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estadísticas durante <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"En este momento, el estado de la memoria del dispositivo es <xliff:g id="MEMSTATE">%1$s</xliff:g>."</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Uso promedio 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="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 61a9c44..c9c3e31 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo 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 ubicación recientes"</string>
-    <string name="location_no_recent_apps" msgid="7156440988150119767">"Ninguna aplicación ha solicitado la ubicación en los últimos 15 minutos."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Ajustes de aplicaciones"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso de batería elevado"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Poco uso de batería"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de ubicación"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Ajustes de impresión"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Servicios de impresión"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Esos documentos pueden contener información confidencial."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Añadir impresoras"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Añadir servicio"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Añadir impresora"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Impresoras"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Los datos de uso de la batería no están disponibles"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estadísticas de <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Actualmente, la memoria del dispositivo está <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Uso de RAM medio"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 8c5fc9c..caae2f6 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Ainult 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="7156440988150119767">"Viimase 15 minuti jooksul pole ükski rakendus asukohateavet taotlenud."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Asukohateenused"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Rakenduse seaded"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Suur akukasutus"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Väike akukasutus"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printimine"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Prindiseaded"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Teenused"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printimisteenused"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> saab teie prinditavaid dokumente vastu võtta. Sellised dokumendid võivad sisaldada tundlikku teavet."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printerite lisamine"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Sees"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Väljas"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Lisa teenus"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Lisa printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Otsing"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printerid"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mis on akut kasutanud"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Aku andmed pole saadaval."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Mälu kasutamine"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistika perioodi <xliff:g id="TIME">%1$s</xliff:g> kohta"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Seadme mälu on olekus <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM-i keskmine kasutus"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Tööaeg"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Teenused"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Kõnesisend ja -väljund"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kõnesisendi ja -väljundi seaded"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Häälotsing"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8e11bc8..ed33a76 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"فقط حسگرهای دستگاه"</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="7156440988150119767">"در ۱۵ دقیقه گذشته هیچ برنامه‌ای درخواست موقعیت مکانی نکرده است."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"خدمات موقعیت مکانی"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"اخیراً هیچ برنامه‌ای موقعیت مکانی را درخواست نکرده است"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"تنظیمات برنامه"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"استفاده زیاد از باتری"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"استفاده کم از باتری"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"حالت مکان"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</string>
     <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
     <string name="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"تنظیمات چاپ"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"خدمات"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> می‌تواند اسنادی را که چاپ می‌کنید دریافت کند. این اسناد ممکن است حاوی اطلاعات مهمی باشند."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"افزودن چاپگرها"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"روشن"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"خاموش"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"افزودن سرویس"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"افزودن چاپگر"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"جستجو"</string>
+    <string name="category_printers" msgid="4345417708283144981">"چاپگرها"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"باتری"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"چه چیزی باتری را مصرف کرده است"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"اطلاعات مصرف باتری موجود نیست."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"استفاده از حافظه"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"آمار در طول <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"حافظه دستگاه در حال حاضر <xliff:g id="MEMSTATE">%1$s</xliff:g> است"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"‏میانگین استفاده از حافظه RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"مدت اجرا"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"خدمات"</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-fi/strings.xml b/res/values-fi/strings.xml
index 9196476..e3d1087 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Vain laitteen antureilla"</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="7156440988150119767">"Ei sijaintipyyntöjä sovelluksilta viimeisen 15 minuutin aikana."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Sijaintipalvelut"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Sovellusasetukset"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Suuri akun kulutus"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Vähäinen akun kulutus"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Paikannustila"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tulostetaan"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Tulostusasetukset"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Palvelut"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Tulostuspalvelut"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> voi vastaanottaa tulostamiasi dokumentteja. Ne voivat sisältää arkaluonteisia tietoja."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ei asennettuja palveluita"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lisää tulostimia"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Käytössä"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Ei käyt."</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Lisää palvelu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Lisää tulostin"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Haku"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Tulostimet"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mikä on käyttänyt akkua"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akun käyttötietoja ei saatav."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Muistin käyttö"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Tiedot ajalta <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Laitteen muistin nykyinen tila: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Keskimääräinen RAM-käyttö"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Käyttöaika"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Palvelut"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Äänisyöte ja -tulo"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Äänisyöte- ja -tulo-asetukset"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Puhehaku"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7540d28..31c2a8b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -568,8 +569,8 @@
     <string name="wifi_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
     <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Autoriser le service de localisation de Google et les autres applications à rechercher des réseaux, même si le Wi-Fi est désactivé"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
-    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
-    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision, entre autres, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Capteurs appareil uniquement"</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="7156440988150119767">"Aucune application n\'a demandé à accéder à vos données de localisation au cours des 15 dernières minutes."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Paramètres de l\'application"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la pile"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Faible utilisation de la pile"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
@@ -1347,7 +1348,7 @@
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Vérifier les applis via USB"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Vérifiez que les applications installées par ADB/ADT ne présentent pas de comportement dangereux."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protéger mémoire de stockage USB"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les applis doivent demander l\'autorisation pour lire la mémoire."</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les applis doivent demander l\'autorisation pour lire la mémoire"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protéger mémoire stockage USB?"</string>
     <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe.\n\nCertaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protéger la carte SD"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Paramètres d\'impression"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Le service <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> peut recevoir les tâches d\'impression. Il est possible que les documents que vous imprimez contiennent des données confidentielles."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Activé"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Désactivé"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter le service"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ajouter une imprimante"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Rechercher"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Imprimantes"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Mémoire utilisée"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiques sur <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"L\'état de la mémoire de l\'appareil est actuellement : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Taux d\'utilisation moyen 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="voice_input_output_settings" msgid="1336135218350444783">"Saisie et sortie vocales"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index afcff85..6e95eb0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -110,10 +110,10 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par d\'autres appareils Bluetooth"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible par appareils Bluetooth à proximité"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visible par d\'autres appareils Bluetooth"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visible uniquement par les appareils associés"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Capteurs appareil uniquement"</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="7156440988150119767">"Aucune application n\'a demandé à accéder à vos données de localisation au cours des 15 dernières minutes."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</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>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Paramètres de l\'application"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Faible utilisation de batterie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode de localisation"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Paramètres d\'impression"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Services d\'impression"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Le service <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> peut recevoir les tâches d\'impression. Il est possible que les documents que vous imprimez contiennent des données confidentielles."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Activé"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Désactivé"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter un service"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ajouter une imprimante"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Rechercher"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Imprimantes"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Utilisation de la mémoire"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiques sur <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Utilisation actuelle de la mémoire de l\'appareil : <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Taux d\'utilisation moyen 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="voice_input_output_settings" msgid="1336135218350444783">"Saisie et sortie vocales"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a9f596a..8e12fb3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -306,8 +306,8 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"अनलॉक करते समय आंख झपकाने की आवश्‍यकता है"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> निष्क्रियता के बाद"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"लॉक स्‍क्रीन पर स्‍वामी की जानकारी दिखाएं"</string>
-    <string name="owner_info_settings_title" msgid="2723190010708381889">"स्‍वामी की जानकारी"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"लॉक स्‍क्रीन पर अपनी जानकारी दिखाएं"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"अपनी जानकारी"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेट सक्षम करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
@@ -324,11 +324,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nएन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nएन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nसुरक्षित तरीका एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और सुरक्षित तरीका पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप सुरक्षित तरीका प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nसुरक्षित तरीका एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और सुरक्षित तरीका पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप सुरक्षित तरीका प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
@@ -351,7 +351,7 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्‍क्रीन बदलें"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"प्रतिमान, पिन या पासवर्ड सुरक्षा बदलें या अक्षम करें"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"आकार, पिन या पासवर्ड सुरक्षा बदलें या अक्षम करें"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"स्‍क्रीन को लॉक करने की विधि चुनें"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"जब फेस अनलॉक आपको नहीं देख पा रहा हो, तो आप कैसे अनलॉक करना चाहेंगे?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"कोई नहीं"</string>
@@ -360,7 +360,7 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"कोई सुरक्षा नहीं"</string>
     <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"फेस अनलॉक"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"निम्न सुरक्षा, प्रयोगात्‍मक"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"प्रतिमान"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"आकार"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"मध्‍यम सुरक्षा"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"पिन"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्‍यम से उच्‍च सुरक्षा"</string>
@@ -370,14 +370,14 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"स्लाइड"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"फेस अनलॉक"</string>
-    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"प्रतिमान"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"आकार"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"पिन"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"पासवर्ड"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्‍क्रीन लॉक बंद करें"</string>
-    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक प्रतिमान निकालें"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"अनलॉक आकार निकालें"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"अनलॉक पिन निकालें"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"अनलॉक पासवर्ड निकालें"</string>
-    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक प्रतिमान बदलें"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड में कम से कम %d वर्ण होने चाहिए"</string>
@@ -536,6 +536,7 @@
     <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>
@@ -922,7 +923,7 @@
     <string name="menu_save" msgid="8109345640668285399">"सहेजें"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"छोड़ें"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
-    <string name="error_name_empty" msgid="8418502878620394756">"नाम फ़ील्‍ड रिक्त नहीं हो सकती."</string>
+    <string name="error_name_empty" msgid="8418502878620394756">"नाम फ़ील्‍ड खाली मत छोड़िए."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"APN रिक्त नहीं हो सकता."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC फ़ील्‍ड में 3 अंक होने चाहिए."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MCC फ़ील्‍ड में 2 या 3 अंक होने चाहिए."</string>
@@ -946,8 +947,8 @@
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"आपकी सभी निजी जानकारी और डाउनलोड किए गए एप्‍लिकेशन मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
-    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"अपना अनलॉक आकार आरेखित करें"</string>
+    <string name="master_clear_gesture_explanation" msgid="826193821455182780">"आपको फ़ैक्टरी डेटा रीसेट की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB संग्रहण मिटाएं"</string>
@@ -961,9 +962,9 @@
     <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप यह क्रिया पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"SD कार्ड में संग्रहीत सभी फ़ाइलें हटाते हुए उसे मिटाएं? आप इस क्रिया को पूर्ववत नहीं कर सकते!"</string>
     <string name="media_format_final_button_text" msgid="4881713344315923175">"सब कुछ मिटाएं"</string>
-    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आप USB संग्रहण मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
-    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक प्रतिमान बनाना होगा."</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"अपना अनलॉक आकार आरेखित करें"</string>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"आप USB संग्रहण मिटाना चाहते हैं, इसकी पुष्टि के लिए आपको अपना अनलॉक आकार बनाना होगा."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"आप SD कार्ड को मिटाना चाहते हैं, इसकी पुष्टि करने के लिए आपको अपना अनलॉक आकार बनाना होगा."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ध्वनिमेल, कॉल अग्रेषण, कॉल प्रतीक्षा, कॉलर आईडी सेट करें"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"केवल उपकरण के सेंसर"</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="7156440988150119767">"पिछले 15 मिनट में किसी भी एप्लिकेशन ने स्थान का अनुरोध नहीं किया है."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"स्‍थान सेवा"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी एप्लिकेशन ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"एप्‍लिकेशन सेटिंग"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
@@ -1025,7 +1026,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"स्‍थान और Google खोज"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"खोज परिणामों और अन्‍य सेवाओं में सुधार के लिए Google को आपके स्‍थान का उपयोग करने दें"</string>
     <string name="location_access_title" msgid="7064108942964081243">"मेरे स्थान पर एक्सेस"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"उन एप्लिकेशन को आपकी स्थान जानकारी का उपयोग करने दें, जिन्होंने आपकी अनुमति मांगी है."</string>
+    <string name="location_access_summary" msgid="69031404093194341">"आप अपनी उन एप्लिकेशन को स्थान जानकारी का उपयोग करने दें, जिन्होंने आपकी अनुमति मांगी है."</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्‍थानीय स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टेबलेट के बारे में"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फ़ोन के बारे में"</string>
@@ -1044,42 +1045,42 @@
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"आपके पास डेटा कनेक्‍शन नहीं है. इस जानकारी को अभी देखने के लिए, इंटरनेट से कनेक्‍ट किसी भी कंप्‍यूटर से %s पर जाएं."</string>
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"लोड हो रहा है..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"अपना पासवर्ड चुनें"</string>
-    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना प्रतिमान चुनें"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"अपना आकार चुनें"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"अपना पिन चुनें"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"अपने पासवर्ड की पुष्टि करें"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने प्रतिमान की पुष्टि करें"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"अपने आकार की पुष्टि करें"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"अपने पिन की पुष्टि करें"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"पिन मेल नहीं खाते"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक चयन"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट कर दिया गया है"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट कर दिया गया है"</string>
-    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"प्रतिमान सेट कर दिया गया है"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"आकार सेट कर दिया गया है"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"स्क्रीन सुरक्षा"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक प्रतिमान बदलें"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक आकार बदलें"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदलें"</string>
-    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"सहेजे गए प्रतिमान की पुष्टि करें"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"सहेजे गए आकार की पुष्टि करें"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"पुनः प्रयास करें:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक प्रतिमान आरेखित करें"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक आकार आरेखित करें"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूर्ण होने पर अंगुली हटा लें"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदुओं को कनेक्‍ट करें. पुन: प्रयास करें:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"प्रतिमान रिकॉर्ड किया गया"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए प्रतिमान को पुन: बनाएं"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक प्रतिमान"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"आकार रिकॉर्ड किया गया"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को पुन: बनाएं"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक आकार"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"पुष्टि करें"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"पुन: प्रयास करें"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"जारी रखें"</string>
-    <string name="lockpattern_settings_title" msgid="3207750489460466680">"अनलॉक प्रतिमान"</string>
-    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"प्रतिमान आवश्‍यक"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"अनलॉक करने के लिए प्रतिमान आरेखित करना होगा"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"पैटर्न दृश्यमान बनाएं"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"अनलॉक आकार"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"आकार आवश्‍यक"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"अनलॉक करने के लिए आकार आरेखित करना होगा"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"पैटर्न दिखाई दे"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"स्‍पर्श पर कंपन करें"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"पॉवर बटन तुरंत लॉक होता है"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"अनलॉक प्रतिमान सेट करें"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"अनलॉक प्रतिमान बदलें"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"अनलॉक प्रतिमान कैसे आरेखित करें"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"अनलॉक आकार सेट करें"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"अनलॉक आकार बदलें"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"अनलॉक आकार कैसे आरेखित करें"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"बहुत से गलत प्रयास!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"आपके फ़ोन पर एप्लिकेशन इंस्टॉल नहीं है."</string>
@@ -1240,8 +1241,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"सिस्‍टम सेवा बंद करें?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके टेबलेट की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"यदि आप यह सेवा रोकते हैं, तो हो सकता है कि आपके फ़ोन की कुछ सुविधाएं ठीक से कार्य करना बंद कर दें जब तक कि आप उसे बंद करके फिर से चालू  न कर लें."</string>
-    <string name="language_settings" msgid="5292716747264442359">"भाषा और इनपुट"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"भाषा और इनपुट"</string>
+    <string name="language_settings" msgid="5292716747264442359">"भाषा और अक्षर"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"भाषा और अक्षर"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"भाषा सेटिंग"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट पद्धति"</string>
     <string name="phone_language" msgid="8870144109924299673">"भाषा"</string>
@@ -1285,7 +1286,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द संपादित करें"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"संपादित करें"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"हटाएं"</string>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"आपके पास उपयोगकर्ता डिक्शनरी में कोई शब्‍द नहीं है. जोड़ें (+) बटन स्‍पर्श करके कोई शब्‍द जोड़ें."</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"आपके पास उपयोगकर्ता शब्दकोश में कोई शब्‍द नहीं है. जोड़ें (+) बटन स्‍पर्श करके कोई शब्‍द जोड़ें."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"सभी भाषाओं के लिए"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"अधिक भाषाएं…"</string>
     <string name="testing" msgid="6584352735303604146">"परीक्षण"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
     <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"प्रिंटिंग सेटिंग"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"सेवाएं"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> आपके द्वारा प्रिंट किए जाने वाले दस्तावेज़ों को प्राप्त कर सकती है. ऐसे दस्तावेज़ों में संवेदनशील डेटा हो सकता है."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"प्रिंटर जोड़ें"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"चालू"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"बंद"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"सेवा जोड़ें"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"प्रिंटर जोड़ें"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"खोजें"</string>
+    <string name="category_printers" msgid="4345417708283144981">"प्रिंटर"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"बैटरी का उपयोग कौन कर रहा है"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"स्मृति उपयोग"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> पर आंकड़े"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"उपकरण स्मृति वर्तमान में <xliff:g id="MEMSTATE">%1$s</xliff:g> है"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"औसत RAM उपयोग"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</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>
@@ -1604,8 +1611,8 @@
     <string name="credential_storage_type" msgid="8629968543494001364">"संग्रहण का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
-    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक आकार आरेखित करें"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल संग्रहण के लिए पासवर्ड लिखें."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index abb34c2..1678baa 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo 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="7156440988150119767">"U posljednjih 15 minuta nijedna aplikacija nije zatražila lokaciju."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lociranja"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije zatražila lokaciju nedavno"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Postavke aplikacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niska potrošnja baterije"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način lokacije"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ispis"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Postavke ispisa"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Usluge"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Usluge ispisa"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> može primati dokumente koje ispisujete. Takvi dokumenti mogu sadržavati osjetljive podatke."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodavanje pisača"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Uključeno"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Isključeno"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj uslugu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj pisač"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Pretraži"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Pisači"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Što troši bateriju"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podaci o iskorištenosti baterije nisu dostupni."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Upotreba memorije"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistički podaci tijekom <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memorija uređaja trenutačno je <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Prosječna 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="voice_input_output_settings" msgid="1336135218350444783">"Glas. ulaz i izlaz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke za glasovni unos i izlazne vrijednosti"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a0e4396..28e1fa9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Csak 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="7156440988150119767">"Egy alkalmazás sem kért le helyadatokat az utolsó 15 percben."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Helyszolgáltatások"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Alkalmazásbeállítások"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Magas akkumulátorhasználat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Alacsony akkumulátorhasználat"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Helymeghatározási mód"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
     <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
     <string name="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Nyomtatási beállítások"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Szolgáltatások"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Nyomdai szolgáltatások"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"A(z) <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> képes fogadni az Ön által nyomtatott dokumentumokat, amelyek bizalmas adatokat tartalmazhatnak."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Nyomtatók hozzáadása"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Be"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Ki"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Szolgáltatás hozzáadása"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Nyomtató hozzáadása"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Keresés"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Nyomtatók"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mi használta az akkumulátort"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Nincs akkuhasználati adat"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Memóriahasználat"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statisztikák a következő időtartamra: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Az eszköz memóriája jelenleg <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Átlagos 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="voice_input_output_settings" msgid="1336135218350444783">"Hang be- és kimenet"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Hang be- és kimenet beállításai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hangalapú keresés"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 9589bd1..fa43806 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Միայն սարքի սենսորները"</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="7156440988150119767">"Վերջին 15 րոպեի ընթացքում ոչ մի հավելված տեղադրության հարցում չի արել:"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Տեղադրության ծառայություններ"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Որևէ ծրագիր տեղադրության հարցում չի կատարել վերջերս"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Հավելվածի կարգավորումներ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Մարտկոցի շատ օգտագործում"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Մարտկոցի քիչ օգտագործում"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղադրության ռեժիմ"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Որևէ նկարագրություն չկա:"</string>
     <string name="settings_button" msgid="3006713718908152930">"Կարգավորումներ"</string>
     <string name="print_settings" msgid="4742428530112487843">"Տպում"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Տպման կարգավորումներ"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Ծառայություններ"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>-ը կարող է ստանալ ձեր տպած փաստաթղթերը: Այդ փաստաթղթերը հնարավոր է՝ պարունակեն գաղտնի տվյալներ:"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Տեղադրված ծառայաթյուններ չկան"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ավելացնել տպիչներ"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Միացված է"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Անջատված է"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ավելացնել ծառայություն"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ավելացնել տպիչ"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Որոնել"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Տպիչներ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Մարտկոց"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ինչն էր օգագործում մարտկոցի լիցքը"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Մարտկոցի օգտագործման տվյալներ չկան:"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Օգտագործվող հիշողություն"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Վիճակագրություն <xliff:g id="TIME">%1$s</xliff:g> ժամանակահատվածի համար"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Սարքի հիշողությունն այժմ <xliff:g id="MEMSTATE">%1$s</xliff:g> է"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM-ի միջին օգտագործումը"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Աշխատաժամանակ"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Ծառայություններ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Ձայնի ներածում &amp; արտածում"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ձայնի մուտքի &amp; ելքի կարգավորումներ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ձայնային որոնում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ed56a8a..bac0e9c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Khusus 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="7156440988150119767">"Tidak ada aplikasi yang meminta lokasi dalam 15 menit terakhir."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Layanan lokasi"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Setelan aplikasi"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan baterai tinggi"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Penggunaan baterai rendah"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode lokasi"</string>
@@ -1422,15 +1423,14 @@
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Mengamati tindakan Anda"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Menerima pemberitahuan saat Anda berinteraksi dengan aplikasi."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Setelan pencetakan"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Layanan"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Layanan cetak"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> dapat menerima dokumen yang Anda cetak. Dokumen seperti itu dapat berisi data sensitif."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambahkan printer"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Aktif"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Nonaktif"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tambahkan layanan"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tambahkan printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Telusuri"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printer"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistik selama <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori perangkat saat ini <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Rata-rata penggunaan RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Waktu berjalan"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Layanan"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Masukan suara &amp; keluaran"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; setelan keluaran"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Penelusuran suara"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6577f0d..02750ad 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo 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="7156440988150119767">"Nessuna app ha richiesto la posizione negli ultimi 15 minuti."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Servizi di localizzazione"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nessuna applicazione ha richiesto la posizione di recente"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Impostazioni app"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Elevato utilizzo della batteria"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Basso utilizzo della batteria"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modalità di localizzazione"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <string name="print_settings" msgid="4742428530112487843">"Stampa"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Impostazioni di stampa"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Servizi"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Servizi di stampa"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> può ricevere i documenti stampati. Tali documenti potrebbero contenere dati riservati."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Attiva"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Non attiva"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Aggiungi servizio"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Aggiungi stampante"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Cerca"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Stampanti"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dati uso batteria non disp."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Memoria usata"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistiche relative al periodo: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Attuale memoria del dispositivo: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Utilizzo medio della RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Run-time"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Servizi"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Impostazioni vocali"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni input e output vocale"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ricerca vocale"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d832600..32a5959 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"חיישני המכשיר בלבד"</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="7156440988150119767">"אף אפליקציה לא ביקשה מיקום ב-15 הדקות האחרונות."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"שירותי מיקום"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"אין אפליקציות שביקשו מיקום לאחרונה"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"הגדרות אפליקציה"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"שימוש בסוללה מלאה"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"שימוש בסוללה חלשה"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"מצב מיקום"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
     <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
     <string name="print_settings" msgid="4742428530112487843">"הדפסה"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"הגדרות הדפסה"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"שירותים"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> יכול לקבל מסמכים שאתה מדפיס. מסמכים כאלה עשויים להכיל נתונים רגישים."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"פועל"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"כבוי"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוסף שירות"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"הוסף מדפסת"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"חפש"</string>
+    <string name="category_printers" msgid="4345417708283144981">"מדפסות"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"סוללה"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"מה השתמש בסוללה"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"אין נתונים זמינים על השימוש בסוללה."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"זיכרון בשימוש"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"סטטיסטיקה למשך הזמן <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"זיכרון המכשיר כעת הוא <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"‏שימוש ממוצע ב-RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"משך ההפעלה"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"שירותים"</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-ja/strings.xml b/res/values-ja/strings.xml
index 0f27b7c..fcefd6d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -538,6 +538,7 @@
     <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>
@@ -1006,8 +1007,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"端末センサーのみ"</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="7156440988150119767">"過去15分以内に現在地情報をリクエストしたアプリはありません。"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"位置情報サービス"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"最近現在地情報をリクエストしたアプリはありません"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"アプリの設定"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"高い電池使用量"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低い電池使用量"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"現在地モード"</string>
@@ -1431,8 +1432,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"印刷"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"印刷設定"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"サービス"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>は印刷したドキュメントを受け取ることができます。このようなドキュメントは機密データが含まれている可能性があります。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
@@ -1440,6 +1440,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"プリンタを追加"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"サービスを追加"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"プリンタを追加"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"検索"</string>
+    <string name="category_printers" msgid="4345417708283144981">"プリンタ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"電池の使用状況"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"電池使用量データがありません。"</string>
@@ -1521,6 +1525,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"メモリ使用"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g>までの統計情報"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"現在の端末メモリの状態は「<xliff:g id="MEMSTATE">%1$s</xliff:g>」です"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"平均RAM使用量"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"実行時間"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"サービス"</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>
@@ -1767,7 +1774,7 @@
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU表示の更新を表示"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPUでの描画時にウィンドウ内の表示を点滅させる"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"ハードウェア層情報を表示"</string>
-    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"ハードウェア層が更新されると緑を表示"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"ハードウェア層が更新されると緑を表示する"</string>
     <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPUオーバードローをデバッグ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
@@ -1795,7 +1802,7 @@
     <string name="show_all_anrs" msgid="28462979638729082">"すべてのANRを表示"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"バックグラウンドアプリが応答しない場合に通知する"</string>
     <string name="experimental_webview" msgid="4492200819033780927">"試験運用版WebViewを使用"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"アプリは最新（ベータ版）のWebViewを使用します"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"アプリは最新（ベータ版）のWebViewを使用する"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用量"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"データ使用サイクル"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"データローミング"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c742704..571ac0e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"მხოლოდ მოწყობილობის სენსორები"</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="7156440988150119767">"ბოლო 15 წუთის განმავლობაში, მდებარეობა არცერთ აპს არ მოუთხოვია."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"მდებარეობის სერვისები"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"ბოლო დროს აპებს მდებარეობის ინფორმაცია არ მოუთხოვია"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"აპის პარამეტრები"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"მძლავრი ბატარეა"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"სუსტი ბატარეა"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"მდებარეობის რეჟიმი"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"აღწერა არ არის მოწოდებული."</string>
     <string name="settings_button" msgid="3006713718908152930">"პარამეტრები"</string>
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"ბეჭდვის პარამეტრები"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"სერვისები"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>-ს შეუძლია თქვენ მიერ დაბეჭდილი დოკუმენტების მიღება. ამგვარი დოკუმენტები შესაძლოა სენსიტიურ მონაცემებს შეიცავდეს."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"სერვისები დაყენებული არ არის"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"პრინტერების დამატება"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ჩართული"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"გამორთული"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"სერვისის დამატება"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"პრინტერის დამატება"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"ძიება"</string>
+    <string name="category_printers" msgid="4345417708283144981">"პრინტერები"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ბატარეა"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"რაზე იხარჯება ბატარეის მუხტი"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ელემენტის მოხმარების მონაცემები მიუწვდომელია."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"გამოყენებული მეხსიერება"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"სტატისტიკა <xliff:g id="TIME">%1$s</xliff:g>-ისთვის"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ამჟამად მოწყობილობის მეხსიერება არის <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM-ის საშუალო გამოყენება"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"გაშვების დრო"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"სერვისები"</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-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 603e0b0..54c4e67 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"ឧបករណ៍​ចាប់​សញ្ញា​បាន​តែ​ឧបករណ៍"</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="7156440988150119767">"គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង​ក្នុង​រយៈ​ពេល ១៥ នាទី។"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"សេវាកម្ម​ទីតាំង"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"ការ​​កំណត់​​កម្មវិធី"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ការ​ប្រើ​ប្រាស់​ថ្ម​​​ខ្លាំង"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ការ​ប្រើប្រាស់​ជិត​អស់​ថ្ម"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"របៀប​ទីតាំង"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"គ្មាន​ការ​ពណ៌នា​បាន​ផ្ដល់។"</string>
     <string name="settings_button" msgid="3006713718908152930">"ការ​កំណត់"</string>
     <string name="print_settings" msgid="4742428530112487843">"ការ​បោះពុម្ព"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"ការ​កំណត់​បោះពុម្ព"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"សេវាកម្ម"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> អាច​ទទួល​ឯកសារ​ដែល​អ្នក​បោះពុម្ព។ ឯកសារ​បែប​នេះ​អាច​មាន​ទិន្នន័យ​ច្បាស់លាស់។"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"បន្ថែម​ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"បើក"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"បិទ"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"បន្ថែម​សេវាកម្ម"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"បន្ថែម​ម៉ាស៊ីន​បោះពុម្ព"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"ស្វែងរក"</string>
+    <string name="category_printers" msgid="4345417708283144981">"ម៉ាស៊ីន​បោះពុម្ព"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ថ្ម"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"អ្វី​​ដែល​កំពុង​​ប្រើ​ថ្ម"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"មិន​មាន​ទិន្នន័យ​ការ​ប្រើ​ថ្ម"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"ការ​ប្រើ​​អង្គ​ចងចាំ"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"ស្ថិតិ​​ <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"​អង្គ​ចងចាំ​ឧបករណ៍ <xliff:g id="MEMSTATE">%1$s</xliff:g> បច្ចុប្បន្ន"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"ការ​ប្រើ​​អង្គ​ចងចាំ​មធ្យម"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"ពេល​ដំណើរការ"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"សេវាកម្ម"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ការ​បញ្ចូល &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f88fa8d..7ead569 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"기기 센서 전용"</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="7156440988150119767">"지난 15분간 위치 정보를 요청한 앱이 없습니다."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"위치 서비스"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"최근에 위치 정보를 요청한 앱이 없습니다."</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"앱 설정"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"배터리 사용량 많음"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"배터리 사용량 적음"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"위치 모드"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"인쇄 설정"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"서비스"</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="919299459931111450">"인쇄한 문서를 <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>에서 받을 수 있습니다. 이런 문서에는 민감한 데이터가 포함되어 있을 수 있습니다."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"프린터 추가"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"서비스 추가"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"프린터 추가"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"검색"</string>
+    <string name="category_printers" msgid="4345417708283144981">"프린터"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"배터리"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"배터리 사용 세부정보"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"배터리 사용 데이터가 없습니다."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"메모리 사용량"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g>을(를) 초과하는 통계"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"현재 기기 메모리가 <xliff:g id="MEMSTATE">%1$s</xliff:g>입니다."</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"평균 RAM 사용"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"재생 시간"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"음성 입력 &amp; 출력"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"음성 입력 &amp; 출력 설정"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"음성 검색"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 688d2e9..0c94e85 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"ເຊັນເຊີຂອງອຸປະກອນເທົ່ານັ້ນ"</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="7156440988150119767">"ບໍ່ມີແອັບຯໃດຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ໃນ 15 ນາທີຜ່ານມາ."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"ບໍລິການສະຖານທີ່"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"ຫຼ້າສຸດນີ້ບໍ່ມີແອັບຯໃດເອີ້ນໃຊ້ຂໍ້ມູນຕຳແໜ່ງ"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"ການຕັ້ງຄ່າແອັບຯ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ໃຊ້ແບັດເຕີຣີ່ໜ້ອຍ"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ບໍ່ມີລາຍລະອຽດລະບຸໄວ້."</string>
     <string name="settings_button" msgid="3006713718908152930">"ການຕັ້ງຄ່າ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ການ​ພິມ"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"ຕັ້ງຄ່າການ​ພິມ"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"ບໍລິການ"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ຮັບ​ເອ​ກະ​ສານ​ທີ່​ທ່ານ​ພິມ​. ເອ​ກະ​ສານ​ດັ່ງ​ກ່າວ​ອາດ​ຈະ​ບັນ​ຈຸ​ຂໍ້​ມູນ​ທີ່​ລະ​ອຽດ​ອ່ອນ​."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ຕື່ມ​ເຄື່ອງພິມ"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ເປີດ"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ປິດ"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ເພີ່ມບໍລິການ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ເພີ່ມເຄື່ອງພິມ"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"ຊອກຫາ"</string>
+    <string name="category_printers" msgid="4345417708283144981">"ເຄື່ອງພິມ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ແບັດເຕີຣີ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ມີຫຍັງແດ່ທີ່ໃຊ້ແບັດເຕີຣີ"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ບໍ່ມີຂໍ້ມູນການນຳໃຊ້ແບັດເຕີຣີ."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"ໜ່ວຍຄວາມຈຳທີ່ໃຊ້"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"ສະຖິຕິໃນເວລາ <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ໜ່ວຍຄວາມຈຳຂອງອຸປະກອນຕອນນີ້ແມ່ນ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"ການ​ນໍາ​ໃຊ້ RAM ໂດຍສະ​ເລ່ຍ"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"ເວລາເຮັດວຽກ"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"ບໍລິການ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ການຕັ້ງປ້ອນຂໍ້ມູນສຽງເຂົ້າ &amp; ອອກ"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ການຕັ້ງຄ່າປ້ອນຂໍ້ມູນສຽງເຂົ້າ &amp; ອອກ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ຊອກຫາດ້ວຍສຽງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c71bc9d..579c225 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Skirta tik įreng. jutikliams"</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="7156440988150119767">"Nė viena programa nesikreipė dėl vietovės duomenų per pastarąsias 15 min."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Vietovės nustatymo paslaugos"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Programos nustatymai"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Naudoja daug akum. energijos"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Naudoja mažai akum. energijos"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Vietovės režimas"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
     <string name="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Spausdinimo nustatymai"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Paslaugos"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Spausdinimo paslaugos"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"„<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>“ galės gauti jūsų spausdinamus dokumentus. Šiuose dokumentuose gali būti delikačių duomenų."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridėti spausdintuvų"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Įjungta"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Išjungta"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pridėti paslaugą"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pridėti spausdintuvą"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Paieška"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Spausdintuvai"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas naudojo akumuliatorių"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akum. naudoj. duom. nepasiek."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Naudojama atmintis"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistika per <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Įrenginio atmintis šiuo metu yra <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Vidutinis 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="voice_input_output_settings" msgid="1336135218350444783">"Balso įvestis ir išvestis"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balso paieška"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 058d20f..2fb86b3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tikai 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="7156440988150119767">"Pēdējo 15 minūšu laikā neviena lietotne nav pieprasījusi atrašanās vietu."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Atrašanās vietu pakalpojumi"</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>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Lietotnes iestatījumi"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Augsts akumulatora patēriņš"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Zems akumulatora patēriņš"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Atrašanās vietas režīms"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Drukāšanas iestatījumi"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Pakalpojumi"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Drukāšanas pakalpojumi"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> var saņemt jūsu drukātos dokumentus. Šajos dokumentos var būt ietverti sensitīvi dati."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pievienot printerus"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Ieslēgta"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Izslēgta"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pievienot pakalpojumu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pievienot printeri"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Meklēt"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printeri"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas patērējis akumulatoru"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akumul. liet. dati nav pieej."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Atmiņas lietojums"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistika par laiku: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Ierīces atmiņas līmenis pašreiz ir <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Vidējais RAM lietojums"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Ilgums"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Pakalpojumi"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Balss ievade un izvade"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balss ievades un izvades iestatījumi"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balss meklēšana"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 2e874db..fb96882 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Зөвхөн төхөөрөмжийг мэдрэгчид"</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="7156440988150119767">"Сүүлийн 15 минутын турш байршлын мэдээлэл авахыг хүссэн апп байхгүй байна."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Байршлын үйлчилгээ"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Саяхан байршлын мэдээлэл хүссэн апп байхгүй"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Апп тохиргоо"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Батерейны зарцуулалт өндөр"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Батерейны зарцуулалт бага"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Байршлын горим"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Тайлбар байхгүй."</string>
     <string name="settings_button" msgid="3006713718908152930">"Тохиргоо"</string>
     <string name="print_settings" msgid="4742428530112487843">"Хэвлэлт"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Хэвлэлтийн тохиргоо"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Үйлчилгээнүүд"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> таны хэвлэх документуудыг хүлээн авч чадна. Тийм документуудад нууц дата агуулагдаж байж болзошгүй."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Үйлчилгээ суулгагдаагүй байна"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Принтер нэмэх"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Идэвхтэй"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Идэвхгүй"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Үйлчилгээ нэмэх"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Принтер нэмэх"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Хайх"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Принтер"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Зай"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Зайны цэнэг юунд ашиглагдсан вэ"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Зайны цэнэг зарцуулалтын өгөгдөл байхгүй байна."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Санах ойн ашиглалт"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> хугацааны статус"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Төхөөрөмжийн санах ой одоо <xliff:g id="MEMSTATE">%1$s</xliff:g> байна"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Дундаж RAM ашиглалт"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Ажилласан хугацаа"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Үйлчилгээнүүд"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Дуугаар оруулах &amp; гарах"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Дуугаар оруулах &amp; гарах тохиргоо"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Дуут хайлт"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index b771639..c3c5fc4 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Penderia peranti sahaja"</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="7156440988150119767">"Tiada apl telah meminta lokasi dalam 15 minit yang lalu."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Perkhidmatan lokasi"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Tiada aplikasi yang telah meminta lokasi baru-baru ini"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Tetapan apl"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Penggunaan bateri tinggi"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Penggunaan bateri rendah"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod lokasi"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Tetapan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Tetapan pencetakan"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Perkhidmatan"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Perkhidmatan cetak"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> boleh menerima dokumen yang anda cetak. Dokumen seperti itu mungkin mengandungi data sensitif."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambah pencetak"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Hidup"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Mati"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Tambahkan perkhidmatan"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Tambah pencetak"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Cari"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Pencetak"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan bateri tidak tersedia.."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistik sepanjang <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memori peranti kini adalah <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Purata penggunaan RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Masa berjalan"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Perkhidmatan"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Input &amp; output suara"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Tetapan input &amp; output suara"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Carian suara"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8383f45..5ed1559 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -799,7 +800,7 @@
     <string name="firmware_version" msgid="4801135784886859972">"Android-versjon"</string>
     <string name="model_number" msgid="3765737700545384794">"Modellnummer"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Utstyrs-ID"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"Radioprogramvare"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
     <string name="build_number" msgid="3075795840572241758">"Byggnummer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Bare 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="7156440988150119767">"Ingen apper har bedt om posisjonen de siste 15 minuttene."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Posisjonstjenester"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Appinnstillinger"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lavt batteribruk"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
@@ -1428,9 +1429,8 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Google Play?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
-    <string name="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinnstillinger"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjenester"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan motta dokumenter du skriver ut. Disse dokumentene kan inneholde private data."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Legg til skrivere"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Legg til tjeneste"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Legg til skriver"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Søk"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Skrivere"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribruksdata ikke tilgj."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Minnebruk"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistikk for <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Enhetsminnet er for tiden <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Gjennomsnittlig RAM-bruk"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Kjøringstid"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Tale (inn/ut)"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Innstillinger for talekommando og -styring"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøk"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 1f3d67a..f57078b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"उपकरण सेन्सरहरू मात्र"</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="7156440988150119767">"पछिल्लो १५ मिनेटमा कुनै पनि अनुप्रयोगहरूले स्थान अनुरोध गरेका छैनन् ।"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"स्थान सेवाहरू"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"हाल कुनै पनि अनुप्रयोगहरूले स्थान अनुरोध गरिएका छैनन्"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"अनुप्रयोग सेटिङहरू"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"उच्च ब्याट्री प्रयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम ब्याट्री प्रयोग"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"स्थान मोड"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"वर्णन प्रदान गरिएको छैन।"</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिङहरू"</string>
     <string name="print_settings" msgid="4742428530112487843">"मुद्रण"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"मुद्रण सेटिङहरू"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"सेवाहरू"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>ले तपाईँले छापेका कागजातहरू प्राप्त गर्न सक्छ। त्यस्ता कागजातहरूमा संवेदनशील डेटाहरू हुन सक्छन्।"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कुनै पनि सेवाहरू स्थापित छैनन्"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"प्रिन्टरहरू थप्नुहोस्"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"खुल्ला"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"बन्द"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"सेवा थप्नुहोस्"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"प्रिन्टर थप्नुहोस्"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"खोज्नुहोस्"</string>
+    <string name="category_printers" msgid="4345417708283144981">"प्रिन्टरहरू"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ब्याट्रि"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ब्याट्रि केले प्रयोग गरिरहेको छ"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ब्याट्रि प्रयोग डेटा उपलब्ध छैन।"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"मेमोरी प्रयोग"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> अवधिको तथ्याङ्क"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"उपकरण स्मृति वर्तमान <xliff:g id="MEMSTATE">%1$s</xliff:g> मा छ"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"औसत RAM उपयोग"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"चालु समय"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"सेवाहरू"</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-nl/strings.xml b/res/values-nl/strings.xml
index e301fc6..de64e31 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Alleen 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="7156440988150119767">"Er zijn geen apps die in de afgelopen vijftien minuten de locatie hebben opgevraagd."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Locatieservices"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Er zijn geen apps die uw locatie onlangs hebben aangevraagd"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"App-instellingen"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoog accugebruik"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Laag accugebruik"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Afdrukinstellingen"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Afdrukservices"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan documenten ontvangen die u afdrukt. Dergelijke documenten kunnen gevoelige gegevens bevatten."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printers toevoegen"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Uit"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Service toevoegen"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Printer toevoegen"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Zoeken"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printers"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Accugebruikgegevens niet beschikbaar."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Geheugengebruik"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistieken voor <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Apparaatgeheugen is momenteel <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Gemiddeld RAM-gebruik"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Uitvoeringstijd"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Spraakinvoer en -uitvoer"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Instellingen voor spraakinvoer en -uitvoer"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Spraakgestuurd zoeken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 26f4743..c304c06 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tylko 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="7156440988150119767">"W ciągu ostatnich 15 minut żadna aplikacja nie poprosiła o lokalizację."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Usługi lokalizacyjne"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Żadne aplikacje nie poprosiły ostatnio o lokalizację"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Ustawienia aplikacji"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Wysokie użycie baterii"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niskie użycie baterii"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Tryb lokalizacji"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
     <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Ustawienia drukowania"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Usługi"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Usługi drukowania"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> może odbierać drukowane przez Ciebie dokumenty, które mogą zawierać poufne dane."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj drukarki"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Włączone"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Wyłączone"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj usługę"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj drukarkę"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Szukaj"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Drukarki"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Brak danych o zużyciu baterii"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Użycie pamięci"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statystyki: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktualny stan pamięci: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Średnie 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="voice_input_output_settings" msgid="1336135218350444783">"Ustawienia głosowe"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ustawienia funkcji głosowych"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Wyszukiwanie głosowe"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 21833bd..6f5c824 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Apenas 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="7156440988150119767">"Nenhuma aplicação solicitou a localização nos últimos 15 minutos."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhuma aplicação solicitou a localização recentemente"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Definições da aplicação"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilização de bateria elevada"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Utilização de bateria baixa"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
     <string name="print_settings" msgid="4742428530112487843">"Imprimir"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Definições de impressão"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber documentos impressos. Tais documentos podem conter dados confidenciais."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adicionar serviço"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adicionar impressora"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Pesquisar"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Impressoras"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados utiliz. bater. não disp."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Utilização da memória"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estatísticas em <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo é de <xliff:g id="MEMSTATE">%1$s</xliff:g> atualmente"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Utilização média 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="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Definições de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa de voz"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e408c1e..97f1820 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Somente sensores do disposit."</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="7156440988150119767">"Nenhum aplicativo solicitou o local nos últimos 15 minutos."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum aplicativo solicitou a localização recentemente"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Configurações do aplicativo"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Uso da bateria reduzido"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impressão"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber os documentos que você imprimir. Esses documentos podem conter dados confidenciais."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adicionar serviço"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adicionar impressora"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Pesquisar"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Impressoras"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Uso da memória"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Estatísticas de <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"A memória do dispositivo está <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Uso médio 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="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configurações de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa por voz"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index aecdad9..631b16a 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -793,6 +793,8 @@
     <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) -->
@@ -1547,9 +1549,9 @@
     <skip />
     <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
     <skip />
-    <!-- no translation found for location_no_recent_apps (7156440988150119767) -->
+    <!-- no translation found for location_no_recent_apps (2800907699722178041) -->
     <skip />
-    <!-- no translation found for location_category_location_services (7437150886946685979) -->
+    <!-- no translation found for location_category_app_settings (46434611182743486) -->
     <skip />
     <!-- no translation found for location_high_battery_use (517199943258508020) -->
     <skip />
@@ -2246,9 +2248,7 @@
     <skip />
     <!-- no translation found for print_settings (4742428530112487843) -->
     <skip />
-    <!-- no translation found for print_settings_title (4911263339115736689) -->
-    <skip />
-    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <!-- no translation found for print_settings_title (3685449667822217816) -->
     <skip />
     <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
     <skip />
@@ -2264,6 +2264,14 @@
     <skip />
     <!-- no translation found for print_feature_state_off (7294876968403966040) -->
     <skip />
+    <!-- no translation found for print_menu_item_add_service (3811645167869797802) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printer (8251218970577291032) -->
+    <skip />
+    <!-- no translation found for print_menu_item_search (7025589328240514553) -->
+    <skip />
+    <!-- no translation found for category_printers (4345417708283144981) -->
+    <skip />
     <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
     <skip />
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumaders da l\'accu"</string>
@@ -2383,6 +2391,12 @@
     <skip />
     <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
     <skip />
+    <!-- no translation found for process_stats_ram_use (1271366870003042708) -->
+    <skip />
+    <!-- no translation found for process_stats_run_time (6520628955709369115) -->
+    <skip />
+    <!-- no translation found for services_subtitle (4296402367067266425) -->
+    <skip />
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada &amp; sortida vocala"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Parameters da l\'entrada e da la sortida vocala"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tschertga vocala"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 729f884..435ed04 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Numai 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="7156440988150119767">"Nicio aplicație nu a solicitat localizarea în ultimele 15 minute."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Servicii de localizare"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Setările aplicației"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Utilizarea intensă a bateriei"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Utilizarea redusă a bateriei"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mod de localizare"</string>
@@ -1430,8 +1431,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printare"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Setări de printare"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Servicii"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Servicii de imprimare"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> poate primi documentele pe care le printați. Aceste documente pot conține informații delicate."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
@@ -1439,6 +1439,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adăugați imprimante"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Activată"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Dezactiv."</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adăugați un serviciu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adăugați o imprimantă"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Căutați"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Imprimante"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ce funcţii au utilizat bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Date utilizare baterie nedisp."</string>
@@ -1520,6 +1524,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Utilizarea memoriei"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistici peste <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Memoria dispozitivului este în prezent <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Utilizare medie RAM"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Durată de rulare"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Servicii"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Intrare şi ieşire voce"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare şi de ieşire a vocii"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Căutare vocală"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 02d63e2..cb772b2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Только сенсоры устройства"</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="7156440988150119767">"За последние 15 мин. приложения не запрашивали геоданные."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Мое местоположение"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"В последнее время приложения не запрашивали геоданные"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Настройки приложений"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Высокий расход заряда батареи"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Низкий расход заряда батареи"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим местоположения"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Печать"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Настройки печати"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Сервисы"</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="919299459931111450">"Сервису \"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>\" могут быть переданы документы, содержащие конфиденциальные данные."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавить принтеры"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ВКЛ"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ВЫКЛ"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Добавить службу печати"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Добавить принтер"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Поиск"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Принтеры"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На что расходуется заряд батареи"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Расход батареи неизвестен."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Использование памяти"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Статистика за <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Уровень свободной памяти: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Использование оперативной памяти (среднее значение)"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Время работы"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Сервисы"</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-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 0699f0d..fc6a9be 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1006,8 +1007,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"උපාංග සංවේදක පමණයි"</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="7156440988150119767">"කිසිඳු යෙදුමක් ගෙවී ගිය මිනිත්තු 15 තුළ ස්ථානය ඉල්ලුම් කර නොමැත."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"ස්ථානීය සේවා"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"මෑතකදී යෙදුම් කිසිවක් ස්ථානය ඉල්ලා නැත"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"යෙදුම් සැකසීම්"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ඉහළ බැටරි භාවිතය"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"අඩු බැටරි භාවිතය"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ස්ථාන ආකාරය"</string>
@@ -1431,8 +1432,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"කිසිඳු විස්තරයක් සපයා නොමැත."</string>
     <string name="settings_button" msgid="3006713718908152930">"සැකසීම්"</string>
     <string name="print_settings" msgid="4742428530112487843">"මුද්‍රණය වෙමින්"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"මුද්‍රණ සැකසීම්"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"සේවා"</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="919299459931111450">"ඔබ මුද්‍රණය කරන ලේඛන <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> වෙත ලැබේ. එවැනි ලේඛන සතුව සංවේදී දත්ත තිබිය හැක."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"සේවා ස්ථාපනය කර නැත"</string>
@@ -1440,6 +1440,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"මුද්‍රණ යන්ත්‍ර එකතු කරන්න"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"සක්‍රිය කරන්න"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"අක්‍රිය කරන්න"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"සේවාව එක් කිරීම"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"මුද්‍රණ යන්ත්‍ර එකතු කරන්න"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"සෙවීම"</string>
+    <string name="category_printers" msgid="4345417708283144981">"මුද්‍රණ යන්ත්‍ර"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"බැටරිය"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"බැටරිය භාවිතා කර ඇත්තේ කුමක්ද"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"බැටරි භාවිතා දත්ත ලබාගත නොහැක."</string>
@@ -1521,6 +1525,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"මතක භාවිතය"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> සමග සංඛ්‍යා ලේඛන"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"වර්තමානයේදී උපාංග මතකය <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"සාමාන්‍ය RAM භාවිතය"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"ධාවන කාලය"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"සේවා"</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-sk/strings.xml b/res/values-sk/strings.xml
index dc18744..bfed331 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Len senzory zariadenia"</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="7156440988150119767">"Počas posledných 15 minút nepožiadali o polohu žiadne aplikácie."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Služby na zisťovanie polohy"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Nastavenia aplikácie"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízka spotreba batérie"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim určovania polohy"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Nastavenia tlače"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Tlačové služby"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> môže prijímať dokumenty, ktoré tlačíte. Tieto dokumenty môžu obsahovať citlivé údaje."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridať tlačiarne"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuté"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuté"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Pridať službu"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Pridať tlačiareň"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Hľadať"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Tlačiarne"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Čo využíva batériu"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotrebe nie sú k dispozícii."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Štatistiky za časové obdobie <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Aktuálny stav pamäte zariadenia: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Priemerné 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="voice_input_output_settings" msgid="1336135218350444783">"Hlasový vstup a výstup"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavenia hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhľadávanie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9f937ff..12bdacb 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo senzorji 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="7156440988150119767">"V zadnjih 15 minutah ni nobena aplikacija zahtevala lokacije."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Lokacijske storitve"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Nastavitve aplikacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka poraba akumulatorja"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nizka poraba akumulatorja"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Način za lokacijo"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Nastavitve tiskanja"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Storitve"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Tiskalne storitve"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Storitev <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> lahko prejema dokumente, ki jih natisnete. Ti dokumenti lahko vsebujejo občutljive podatke."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodajanje tiskalnikov"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Vklop"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Izklop"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj storitev"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodajanje tiskalnika"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Iskanje"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Tiskalniki"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kaj porablja energijo baterije"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podatki o porabi baterije niso na voljo."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Poraba pomnilnika"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistični podatki za <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Trenutno stanje pomnilnika naprave: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Povprečna 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="voice_input_output_settings" msgid="1336135218350444783">"Glasovni vnos in izhod"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavitve glasovnega vnosa in izhoda"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno iskanje"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d763ce8..9262790 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензори за уређаје"</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="7156440988150119767">"Ниједна апликација није захтевала локацију у последњих 15 минута."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Услуге локације"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Ниједна апликација није скоро тражила локацију"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Подешавања апликација"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Велика искоришћеност батерије"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Мала искоришћеност батерије"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локације"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
     <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
     <string name="print_settings" msgid="4742428530112487843">"Штампање"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Подешавања штампања"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Услуге"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да прима документе које штампате. Такви документи могу да садрже осетљиве податке."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додај штампаче"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Укључено"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Искључено"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додај услугу"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Додај штампач"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Претражи"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Штампачи"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Шта користи батерију"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Нема података о кориш. батерије"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Искоришћеност меморије"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Статистика за период од <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Меморија уређаја је тренутно <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Просечно коришћење RAM-а"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Трајање"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Услуге"</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-sv/strings.xml b/res/values-sv/strings.xml
index cc0d349..b81ee5a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Endast 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="7156440988150119767">"Inga appar har gjort några platsbegäranden under de senaste 15 minuterna."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Platstjänster"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Inga appar har begärt uppgifter om plats nyligen"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Appinställningar"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hög batterianvändning"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Låg batterianvändning"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Platsläge"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinställningar"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Tjänster"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Utskriftstjänster"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan ta emot dokument som du skriver ut. Sådana dokument kan innehålla känsliga uppgifter."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lägg till skrivare"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Lägg till tjänst"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Lägg till skrivare"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Sök"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Skrivare"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteriinfo ej tillgänglig."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Minnesanvändning"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Statistik över <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Mängden tillgängligt minne på enheten är för närvarande <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Genomsnittlig 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="voice_input_output_settings" msgid="1336135218350444783">"Röstindata och -utdata"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Inställningar för röstindata och -utdata"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Röstsökning"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index aa5d68f..dffae42 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -528,6 +528,7 @@
     <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>
@@ -998,8 +999,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Sensa ya vifaa pekee"</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 eneo"</string>
-    <string name="location_no_recent_apps" msgid="7156440988150119767">"Hakuna programu zilizoomba eneo katika dakika 15 zilizopita."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Huduma za eneo"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyoomba eneo hivi karibuni"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Mipangilio ya programu"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Matumizi ya betri ya hali ya juu"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Matumizi ya betri ya hali ya chini"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Hali ya eneo"</string>
@@ -1423,8 +1424,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Mipangilio ya kuchapisha"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Huduma"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> inaweza kupokea hati unazozichapisha. Hati kama hizo zinaweza kuwa na data nyeti."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
@@ -1432,6 +1432,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ongeza printa"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Kimewashwa"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Kimezimwa"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ongeza huduma"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ongeza printa"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Utafutaji"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Printa"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data ya matumizi ya betri haipatikani."</string>
@@ -1513,6 +1517,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Kumbukumbu iliyotumika"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Takwimu kwa kipindi cha <xliff:g id="TIME">%1$s</xliff:g>"</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_ram_use" msgid="1271366870003042708">"Wastani 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="voice_input_output_settings" msgid="1336135218350444783">"Kiingizaji cha sauti &amp; kutoa nje"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kiingizaji cha sauti &amp; mipangilio ya kutoa nje"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tafuta kwa kutamka"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5a1ef9e..d72d16c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"เซ็นเซอร์ของอุปกรณ์เท่านั้น"</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="7156440988150119767">"ไม่มีแอปที่ขอตำแหน่งใน 15 นาทีที่ผ่านมา"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"บริการตำแหน่ง"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"ไม่มีแอปใดทำการขอตำแหน่งเมื่อเร็วๆ นี้"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"การตั้งค่าแอป"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ใช้แบตเตอรี่มาก"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ใช้แบตเตอรี่น้อย"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"โหมดตำแหน่ง"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
     <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
     <string name="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"การตั้งค่าการพิมพ์"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"บริการ"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> สามารถรับเอกสารที่คุณพิมพ์ เอกสารดังกล่าวอาจมีข้อมูลละเอียดอ่อน"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"เพิ่มเครื่องพิมพ์"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"เปิด"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ปิด"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"เพิ่มบริการ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"เพิ่มเครื่องพิมพ์"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"ค้นหา"</string>
+    <string name="category_printers" msgid="4345417708283144981">"เครื่องพิมพ์"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"แบตเตอรี่"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"อะไรที่ใช้งานแบตเตอรี่อยู่"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ไม่มีข้อมูลการใช้แบตเตอรี่"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"การใช้หน่วยความจำ"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"สถิติในช่วง <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"ขณะนี้หน่วยความจำอุปกรณ์มีสถานะ <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"การใช้ RAM เฉลี่ย"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"เวลาที่แสดง"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"บริการ"</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-tl/strings.xml b/res/values-tl/strings.xml
index cf1fc17..01c0802 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Mga sensor ng device lang"</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="7156440988150119767">"Walang apps na humiling ng lokasyon sa huling 15 minuto."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Mga serbisyo sa lokasyon"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Walang apps ang humiling ng lokasyon kamakailan"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Mga setting ng app"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Mataas na paggamit ng baterya"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Mababang paggamit ng baterya"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode ng lokasyon"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Mga setting ng pag-print"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Mga Serbisyo"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"Makakatanggap ang <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ng mga dokumentong pini-print mo. Maaaring maglaman ang mga naturang dokumento ng sensitibong data."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Magdagdag ng mga printer"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Naka-on"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Naka-off"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Magdagdag ng serbisyo"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Magdagdag ng printer"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Maghanap"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Mga Printer"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ano ang gumagamit ng baterya"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Di avail data ng gmit baterya."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Memory na ginamit"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Mga istatistika sa <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Kasalukuyang <xliff:g id="MEMSTATE">%1$s</xliff:g> ang memory ng device"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Average 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="voice_input_output_settings" msgid="1336135218350444783">"Input &amp; output ng boses"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Pag-input ng boses &amp; mga setting ng output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Paghahanap gamit ang boses"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9708c25..cac6ce0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Yalnızca 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="7156440988150119767">"Son 15 dakika içinde hiçbir uygulama konum bilgisine erişme isteğinde bulunmadı."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Konum hizmetleri"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Yakın zamanda hiçbir uygulama konum bilgisi isteğinde bulunmadı"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Uygulama ayarları"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Düşük pil kullanımı"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Konum modu"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Yazdırma ayarları"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Hizmetler"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Yazdırma hizmetleri"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> yazdırdığınız dokümanları alabilir. Bu tür dokümanlar hassas veriler içerebilir."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Yazıcı ekle"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Açık"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Kapalı"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Hizmet ekle"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Yazıcı ekle"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Ara"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Yazıcılar"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Pil kullanım verisi yok."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g> süreyi kapsayan istatistikler"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Cihaz belleğinin mevcut durumu: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Ortalama 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="voice_input_output_settings" msgid="1336135218350444783">"Ses girişi/çıkışı"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ses giriş/çıkış ayarları"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ses ile arama"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0b27ca1..8bcde3c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Лише датчики пристрою"</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="7156440988150119767">"Жодна програма не запитувала місцезнаходження за останні 15 хвилин."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Служби локації"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Жодна програма не запитувала місцезнаходження останнім часом"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Налаштування програми"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Значне використання заряду"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Низьке використання заряду"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим локації"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
     <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Налаштування друку"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Служби"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> отримуватиме документи, які ви друкуєте. Такі документи можуть містити конфіденційну інформацію."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додати принтери"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Увімк."</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Вимк."</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Додати службу"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Додати принтер"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Пошук"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Принтери"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На що споживається заряд акумулятора"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Дані використання акумулятора недоступні"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Використання пам’яті"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Статистика за <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Поточний стан пам’яті пристрою: <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Сер. використання оперативної пам’яті"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Час виконання"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Служби"</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-vi/strings.xml b/res/values-vi/strings.xml
index 5c4947d..41afc10 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Chỉ 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="7156440988150119767">"Chưa có ứng dụng nào yêu cầu vị trí trong 15 phút qua."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Dịch vụ vị trí"</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>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Cài đặt ứng dụng"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Mức sử dụng pin cao"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Mức sử dụng pin thấp"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Chế độ vị trí"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
     <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Cài đặt in"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Dịch vụ"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Dịch vụ in"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> có thể nhận tài liệu mà bạn in. Những tài liệu như vậy có thể chứa dữ liệu nhạy cảm."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Thêm máy in"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Bật"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Tắt"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Thêm dịch vụ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Thêm máy in"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Tìm kiếm"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Máy in"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Cái gì đang sử dụng pin"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Không có dữ liệu sử dụng pin."</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Mức sử dụng bộ nhớ"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Số liệu thống kê theo <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Bộ nhớ thiết bị hiện tại là <xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Sử dụng RAM trung bình"</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="voice_input_output_settings" msgid="1336135218350444783">"Nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Cài đặt nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tìm kiếm bằng giọng nói"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6d09a0f..b76228a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"仅使用设备传感器"</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="7156440988150119767">"过去15分钟内没有任何应用申请使用位置信息。"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"位置信息服务"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"最近没有任何应用申请使用位置信息"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"应用设置"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"高电耗"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低电耗"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置信息模式"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <string name="print_settings" msgid="4742428530112487843">"打印"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"打印设置"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"服务"</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="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>可以接收您打印的文档。此类文档可能包含敏感数据。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"添加打印机"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"打开"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"关闭"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"添加服务"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"添加打印机"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"搜索"</string>
+    <string name="category_printers" msgid="4345417708283144981">"打印机"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"无法获取电池使用数据。"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"内存用量"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"<xliff:g id="TIME">%1$s</xliff:g>的统计信息"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"设备内存当前状态：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM 平均使用率"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"服务"</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-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 503ca09..4b05de1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"只限裝置感應器"</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="7156440988150119767">"過去 15 分鐘內沒有應用程式要求位置資料。"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"定位服務"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資料"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"應用程式設定"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"高電池用量"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"低電池用量"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"列印設定"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"服務"</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="919299459931111450">"「<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>」可接收您所列印的文件，而這些文件可能含有機密資料。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增打印機"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"開啟"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"關閉"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"新增服務"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"新增打印機"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"搜尋"</string>
+    <string name="category_printers" msgid="4345417708283144981">"打印機"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"查看正在消耗電力的功能"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"統計資料涵蓋時段：<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"裝置記憶體目前的狀態：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM 平均使用量"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"服務"</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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dcdbf79..ad61e7d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1004,8 +1005,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"僅限裝置感應器"</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="7156440988150119767">"過去 15 分鐘內沒有應用程式要求存取位置資訊。"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"定位服務"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資訊"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"應用程式設定"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"耗電量高"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"耗電量低"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
@@ -1429,8 +1430,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"列印設定"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"服務"</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="919299459931111450">"「<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>」可接收您所列印的文件，這些文件可能含有機密資料。"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
@@ -1438,6 +1438,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增印表機"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"開啟"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"關閉"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"新增服務"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"新增印表機"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"搜尋"</string>
+    <string name="category_printers" msgid="4345417708283144981">"印表機"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"查看正在消耗電力的功能"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
@@ -1519,6 +1523,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"統計資料涵蓋時間範圍：<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"裝置記憶體目前狀態：<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"RAM 平均使用量"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"服務"</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-zu/strings.xml b/res/values-zu/strings.xml
index 134dd09..1a109a6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -536,6 +536,7 @@
     <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>
@@ -1005,8 +1006,8 @@
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Izinzwa zedivayisi kuphela"</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="7156440988150119767">"Azikho izinhlelo zokusebenza ezicele indawo kumaminithi angu-15 wokugcina."</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Amasevisi wendawo"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
+    <string name="location_category_app_settings" msgid="46434611182743486">"Izilungiselelo zohlelo lokusebenza"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Ukusebenzisa ibhetri okuphezulu"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Ukusebenzisa ibhetri okuphansi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
@@ -1436,8 +1437,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
-    <string name="print_settings_title" msgid="4911263339115736689">"Izilungiselelo zokuphrinta"</string>
-    <string name="print_services_title" msgid="1088097751249445946">"Amasevisi"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Amasevisi wokuphrinta"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="919299459931111450">"I-<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ingathola amadokhumenti owaphrintayo. Amadokhumenti anjalo angaqukatha idatha ebucayi."</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
@@ -1445,6 +1445,10 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Engeza amaphrinta"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Vuliwe"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Valiwe"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Engeza isevisi"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Engeza iphrinta"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"Sesha"</string>
+    <string name="category_printers" msgid="4345417708283144981">"Amaphrinta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Idatha esebenzisa ibhethri ayitholakali."</string>
@@ -1526,6 +1530,9 @@
     <string name="app_memory_use" msgid="7849258480392171939">"Ukusetshenziswa kwememori"</string>
     <string name="process_stats_total_duration" msgid="663196332079061529">"Izibalo ziphele ngo-<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="process_stats_memory_status" msgid="4251599550196193093">"Imemori yedivayisi okwamanje yi-<xliff:g id="MEMSTATE">%1$s</xliff:g>"</string>
+    <string name="process_stats_ram_use" msgid="1271366870003042708">"Ukusetshenziswa kwe-RAM okumaphakathi nendawo"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"Isikhathi sokuqalisa"</string>
+    <string name="services_subtitle" msgid="4296402367067266425">"Amasevisi"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Okufakwayo ngezwi; nokukhishwayo"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Okufakwayo ngezwi; nezilungiselelo zokukhishwayo"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ukusesha ngezwi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ded01d9..492697d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2401,7 +2401,7 @@
     <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
     <string name="location_category_recent_location_requests">Recent location requests</string>
     <!-- Location settings screen, displayed when there's no recent app accessing location -->
-    <string name="location_no_recent_apps">No apps have requested location in the last 15 minutes.</string>
+    <string name="location_no_recent_apps">No apps have requested location recently</string>
     <!-- [CHAR LIMIT=30] Location settings screen, sub category for app settings -->
     <string name="location_category_app_settings">App settings</string>
     <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 8362a83..e8dbc03 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -52,11 +52,6 @@
         android:entryValues="@array/hdcp_checking_values" />
 
     <CheckBoxPreference
-        android:key="enforce_read_external"
-        android:title="@string/enforce_read_external_title"
-        android:summary="@string/enforce_read_external_summary" />
-
-    <CheckBoxPreference
         android:key="bt_hci_snoop_log"
         android:title="@string/bt_hci_snoop_log"
         android:summary="@string/bt_hci_snoop_log_summary"/>
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 3d5678d..a0b18fd 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -141,13 +141,13 @@
 import com.android.settings.widget.PieChartView;
 import com.google.android.collect.Lists;
 
+import libcore.util.Objects;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import libcore.util.Objects;
-
 /**
  * Panel showing data usage history across various networks, including options
  * to inspect based on usage cycle and control through {@link NetworkPolicy}.
@@ -277,6 +277,16 @@
         mPolicyEditor.read();
 
         try {
+            if (!mNetworkService.isBandwidthControlEnabled()) {
+                Log.w(TAG, "No bandwidth control; leaving");
+                getActivity().finish();
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "No bandwidth control; leaving");
+            getActivity().finish();
+        }
+
+        try {
             mStatsSession = mStatsService.openSession();
         } catch (RemoteException e) {
             throw new RuntimeException(e);
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 1542bce..3e05bd9 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,15 +16,11 @@
 
 package com.android.settings;
 
-import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ActivityManagerNative;
-import android.app.ActivityThread;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.admin.DevicePolicyManager;
 import android.app.backup.IBackupManager;
 import android.bluetooth.BluetoothAdapter;
@@ -59,11 +55,11 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.WebViewFactory;
 import android.view.Gravity;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
 import android.view.View;
+import android.webkit.WebViewFactory;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -103,7 +99,6 @@
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
-    private static final String ENFORCE_READ_EXTERNAL = "enforce_read_external";
     private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
     private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
     private static final String MSAA_PROPERTY = "debug.egl.force_msaa";
@@ -171,7 +166,6 @@
     private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mBtHciSnoopLog;
-    private CheckBoxPreference mEnforceReadExternal;
     private CheckBoxPreference mAllowMockLocation;
     private PreferenceScreen mPassword;
 
@@ -263,7 +257,6 @@
         mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
         mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG);
-        mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
         mAllPrefs.add(mPassword);
@@ -492,7 +485,6 @@
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
         updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr,
                 Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
-        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
         updateRuntimeValue();
@@ -1250,12 +1242,6 @@
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
         } else if (preference == mBtHciSnoopLog) {
             writeBtHciSnoopLogOptions();
-        } else if (preference == mEnforceReadExternal) {
-            if (mEnforceReadExternal.isChecked()) {
-                ConfirmEnforceFragment.show(this);
-            } else {
-                setPermissionEnforced(getActivity(), READ_EXTERNAL_STORAGE, false);
-            }
         } else if (preference == mAllowMockLocation) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
@@ -1477,61 +1463,6 @@
         }
     }
 
-    /**
-     * Dialog to confirm enforcement of {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}.
-     */
-    public static class ConfirmEnforceFragment extends DialogFragment {
-        public static void show(DevelopmentSettings parent) {
-            final ConfirmEnforceFragment dialog = new ConfirmEnforceFragment();
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_ENFORCE);
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.enforce_read_external_confirm_title);
-            builder.setMessage(R.string.enforce_read_external_confirm_message);
-
-            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    setPermissionEnforced(context, READ_EXTERNAL_STORAGE, true);
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-
-            return builder.create();
-        }
-    }
-
-    private static boolean isPermissionEnforced(String permission) {
-        try {
-            return ActivityThread.getPackageManager().isPermissionEnforced(permission);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
-        }
-    }
-
-    private static void setPermissionEnforced(
-            Context context, String permission, boolean enforced) {
-        try {
-            // TODO: offload to background thread
-            ActivityThread.getPackageManager()
-                    .setPermissionEnforced(READ_EXTERNAL_STORAGE, enforced);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
-        }
-    }
-
     private static boolean isPackageInstalled(Context context, String packageName) {
         try {
             return context.getPackageManager().getPackageInfo(packageName, 0) != null;
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index d37688c..aa10c9e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -50,6 +50,7 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.PagerTabStrip;
 import android.support.v4.view.ViewPager;
+import android.text.BidiFormatter;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -385,20 +386,21 @@
                 return;
             }
             if (mTotalStorage > 0) {
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
                 mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
                         mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
                 long usedStorage = mTotalStorage - mFreeStorage;
                 if (mLastUsedStorage != usedStorage) {
                     mLastUsedStorage = usedStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), usedStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), usedStorage));
                     mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_foreground_processes, sizeStr));
                 }
                 if (mLastFreeStorage != mFreeStorage) {
                     mLastFreeStorage = mFreeStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), mFreeStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), mFreeStorage));
                     mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_background_processes, sizeStr));
                 }
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index cbbfbb7..d6311dc 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -78,7 +78,6 @@
         mBestTargetPackage = null;
         if (mUnique) {
             mBestTargetPackage = mPackage;
-            addServices(stats.getPackageStateLocked(mPackage, mUid));
         } else {
             // See if there is one significant package that was running here.
             ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>();
@@ -90,18 +89,13 @@
                         continue;
                     }
                     ProcessStats.PackageState pkgState = uids.valueAt(iu);
-                    boolean match = false;
                     for (int iproc=0, NPROC=pkgState.mProcesses.size(); iproc<NPROC; iproc++) {
                         ProcessStats.ProcessState subProc =
                                 pkgState.mProcesses.valueAt(iproc);
                         if (subProc.mName.equals(mName)) {
-                            match = true;
                             subProcs.add(new ProcStatsEntry(subProc, totals));
                         }
                     }
-                    if (match) {
-                        addServices(stats.getPackageStateLocked(mPackage, mUid));
-                    }
                 }
             }
             if (subProcs.size() > 1) {
@@ -173,12 +167,8 @@
         }
     }
 
-    public void addServices(ProcessStats.PackageState pkgState) {
-        for (int isvc=0, NSVC=pkgState.mServices.size(); isvc<NSVC; isvc++) {
-            ProcessStats.ServiceState svc = pkgState.mServices.valueAt(isvc);
-            // XXX can't tell what process it is in!
-            mServices.add(new Service(svc));
-        }
+    public void addService(ProcessStats.ServiceState svc) {
+        mServices.add(new Service(svc));
     }
 
     @Override
@@ -213,32 +203,22 @@
     public static final class Service implements Parcelable {
         final String mPackage;
         final String mName;
+        final String mProcess;
         final long mDuration;
 
         public Service(ProcessStats.ServiceState service) {
             mPackage = service.mPackage;
             mName = service.mName;
-            long startDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
-                    ProcessStats.ServiceState.SERVICE_STARTED,
+            mProcess = service.mProcessName;
+            mDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_RUN,
                     ProcessStats.STATE_NOTHING, 0, 0);
-            long bindDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
-                    ProcessStats.ServiceState.SERVICE_BOUND,
-                    ProcessStats.STATE_NOTHING, 0, 0);
-            long execDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
-                    ProcessStats.ServiceState.SERVICE_EXEC,
-                    ProcessStats.STATE_NOTHING, 0, 0);
-            if (bindDuration > startDuration) {
-                startDuration = bindDuration;
-            }
-            if (execDuration > startDuration) {
-                startDuration = execDuration;
-            }
-            mDuration = startDuration;
         }
 
         public Service(Parcel in) {
             mPackage = in.readString();
             mName = in.readString();
+            mProcess = in.readString();
             mDuration = in.readLong();
         }
 
@@ -251,6 +231,7 @@
         public void writeToParcel(Parcel dest, int flags) {
             dest.writeString(mPackage);
             dest.writeString(mName);
+            dest.writeString(mProcess);
             dest.writeLong(mDuration);
         }
 
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 49682ed..5c5355d 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -30,6 +30,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.TimeUtils;
@@ -245,10 +246,14 @@
         }
         */
 
+        ArrayMap<String, ProcStatsEntry> processes = new ArrayMap<String, ProcStatsEntry>(
+                mStats.mProcesses.getMap().size());
         for (int ip=0, N=mStats.mProcesses.getMap().size(); ip<N; ip++) {
             SparseArray<ProcessStats.ProcessState> uids = mStats.mProcesses.getMap().valueAt(ip);
             for (int iu=0; iu<uids.size(); iu++) {
-                procs.add(new ProcStatsEntry(uids.valueAt(iu), totals));
+                ProcStatsEntry ent = new ProcStatsEntry(uids.valueAt(iu), totals);
+                procs.add(ent);
+                processes.put(ent.mName, ent);
             }
         }
 
@@ -283,6 +288,21 @@
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
+
+        // Add in service info.
+        for (int ip=0, N=mStats.mPackages.getMap().size(); ip<N; ip++) {
+            SparseArray<ProcessStats.PackageState> uids = mStats.mPackages.getMap().valueAt(ip);
+            for (int iu=0; iu<uids.size(); iu++) {
+                ProcessStats.PackageState ps = uids.valueAt(iu);
+                for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
+                    ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
+                    if (ss.mProcessName != null) {
+                        ProcStatsEntry ent = processes.get(ss.mProcessName);
+                        ent.addService(ss);
+                    }
+                }
+            }
+        }
     }
 
     private void load() {
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 67221ae..52c4841 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.text.BidiFormatter;
 import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 
@@ -342,11 +343,14 @@
                 mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
                 mLastAvailMemory = availMem;
                 long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
-                String sizeStr = Formatter.formatShortFileSize(getContext(), freeMem);
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+                String sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(), freeMem));
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.service_background_processes, sizeStr));
-                sizeStr = Formatter.formatShortFileSize(getContext(),
-                        mMemInfoReader.getTotalSize() - freeMem);
+                sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(),
+                                mMemInfoReader.getTotalSize() - freeMem));
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
             }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 740fdb5..dc86b8d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -249,7 +249,10 @@
                     }
                     break;
                 case BatteryStatsHelper.MSG_REPORT_FULLY_DRAWN:
-                    getActivity().reportFullyDrawn();
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        activity.reportFullyDrawn();
+                    }
                     break;
             }
             super.handleMessage(msg);
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 6dceea9..add82c6 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.location.LocationManager;
 import android.location.SettingInjectorService;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -60,6 +61,7 @@
     private Switch mSwitch;
     private boolean mValidListener;
     private Preference mLocationMode;
+    private PreferenceCategory mCategoryRecentLocationRequests;
     private BatteryStatsHelper mStatsHelper;
     /** Receives UPDATE_INTENT  */
     private BroadcastReceiver mReceiver;
@@ -149,45 +151,22 @@
                     }
                 });
 
-        PreferenceCategory categoryRecentLocationRequests =
+        mCategoryRecentLocationRequests =
                 (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
         RecentLocationApps recentApps = new RecentLocationApps(activity, mStatsHelper);
         List<Preference> recentLocationRequests = recentApps.getAppList();
         if (recentLocationRequests.size() > 0) {
-            addPreferencesSorted(recentLocationRequests, categoryRecentLocationRequests);
+            addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests);
         } else {
             // If there's no item to display, add a "No recent apps" item.
             Preference banner = new Preference(activity);
             banner.setLayoutResource(R.layout.location_list_no_item);
             banner.setTitle(R.string.location_no_recent_apps);
             banner.setSelectable(false);
-            banner.setEnabled(false);
-            categoryRecentLocationRequests.addPreference(banner);
+            mCategoryRecentLocationRequests.addPreference(banner);
         }
 
-        PreferenceCategory categoryAppSettings =
-                (PreferenceCategory) root.findPreference(KEY_APP_SETTINGS);
-        final SettingsInjector injector = new SettingsInjector(activity);
-        List<Preference> appSettings = injector.getInjectedSettings();
-
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (Log.isLoggable(TAG, Log.DEBUG)) {
-                    Log.d(TAG, "Received settings change intent: " + intent);
-                }
-                injector.reloadStatusMessages();
-            }
-        };
-        activity.registerReceiver(mReceiver,
-                new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED));
-
-        if (appSettings.size() > 0) {
-            addPreferencesSorted(appSettings, categoryAppSettings);
-        } else {
-            // If there's no item to display, remove the whole category.
-            root.removePreference(categoryAppSettings);
-        }
+        addAppSettings(activity, root);
 
         // Only show the master switch when we're not in multi-pane mode, and not being used as
         // Setup Wizard.
@@ -209,6 +188,45 @@
         return root;
     }
 
+    /**
+     * Add the settings injected by external apps into the "App Settings" category. Hides the
+     * category if there are no injected settings.
+     *
+     * Reloads the settings whenever receives
+     * {@link SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED}. As a safety measure,
+     * also reloads on {@link LocationManager#MODE_CHANGED_ACTION} to ensure the settings are
+     * up-to-date after mode changes even if an affected app doesn't send the setting changed
+     * broadcast.
+     */
+    private void addAppSettings(Context context, PreferenceScreen root) {
+        PreferenceCategory categoryAppSettings =
+                (PreferenceCategory) root.findPreference(KEY_APP_SETTINGS);
+        final SettingsInjector injector = new SettingsInjector(context);
+        List<Preference> appSettings = injector.getInjectedSettings();
+
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Received settings change intent: " + intent);
+                }
+                injector.reloadStatusMessages();
+            }
+        };
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
+        filter.addAction(LocationManager.MODE_CHANGED_ACTION);
+        context.registerReceiver(mReceiver, filter);
+
+        if (appSettings.size() > 0) {
+            addPreferencesSorted(appSettings, categoryAppSettings);
+        } else {
+            // If there's no item to display, remove the whole category.
+            root.removePreference(categoryAppSettings);
+        }
+    }
+
     @Override
     public int getHelpResource() {
         return R.string.help_url_location_access;
@@ -239,6 +257,7 @@
         boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);
         mSwitch.setEnabled(!restricted);
         mLocationMode.setEnabled(enabled && !restricted);
+        mCategoryRecentLocationRequests.setEnabled(enabled);
 
         if (enabled != mSwitch.isChecked()) {
             // set listener to null so that that code below doesn't trigger onCheckedChanged()
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index 5929466..b919080 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
@@ -138,8 +139,8 @@
     }
 
     /**
-     * Parses {@link InjectedSetting} from the attributes of the
-     * {@link SettingInjectorService#META_DATA_NAME} tag.
+     * Returns the settings parsed from the attributes of the
+     * {@link SettingInjectorService#META_DATA_NAME} tag, or null.
      *
      * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
      */
@@ -147,6 +148,15 @@
             throws XmlPullParserException, IOException {
 
         ServiceInfo si = service.serviceInfo;
+        ApplicationInfo ai = si.applicationInfo;
+
+        if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Ignoring attempt to inject setting from app not in system image: "
+                        + service);
+                return null;
+            }
+        }
 
         XmlResourceParser parser = null;
         try {
@@ -169,7 +179,7 @@
                         + SettingInjectorService.ATTRIBUTES_NAME + " tag");
             }
 
-            Resources res = pm.getResourcesForApplication(si.applicationInfo);
+            Resources res = pm.getResourcesForApplication(ai);
             return parseAttributes(si.packageName, si.name, res, attrs);
         } catch (PackageManager.NameNotFoundException e) {
             throw new XmlPullParserException(
@@ -191,17 +201,17 @@
         try {
             // Note that to help guard against malicious string injection, we do not allow dynamic
             // specification of the label (setting title)
-            final String label = sa.getString(android.R.styleable.SettingInjectorService_title);
-            final int iconId = sa.getResourceId(
-                    android.R.styleable.SettingInjectorService_icon, 0);
+            final String title = sa.getString(android.R.styleable.SettingInjectorService_title);
+            final int iconId =
+                    sa.getResourceId(android.R.styleable.SettingInjectorService_icon, 0);
             final String settingsActivity =
                     sa.getString(android.R.styleable.SettingInjectorService_settingsActivity);
             if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "parsed label: " + label + ", iconId: " + iconId
+                Log.d(TAG, "parsed title: " + title + ", iconId: " + iconId
                         + ", settingsActivity: " + settingsActivity);
             }
             return InjectedSetting.newInstance(packageName, className,
-                    label, iconId, settingsActivity);
+                    title, iconId, settingsActivity);
         } finally {
             sa.recycle();
         }
@@ -302,7 +312,8 @@
                     mSettingsBeingLoaded.remove(timedOutSetting);
                     mTimedOutSettings.add(timedOutSetting);
                     if (Log.isLoggable(TAG, Log.WARN)) {
-                        Log.w(TAG, "Timed out trying to get status for: " + timedOutSetting);
+                        Log.w(TAG, "Timed out after " + timedOutSetting.getElapsedTime()
+                                + " millis trying to get status for: " + timedOutSetting);
                     }
                     break;
                 default:
@@ -437,13 +448,21 @@
             } else {
                 startMillis = 0;
             }
-            mContext.startService(intent);
+
+            // Start the service, making sure that this is attributed to the current user rather
+            // than the system user.
+            mContext.startServiceAsUser(intent, android.os.Process.myUserHandle());
+        }
+
+        public long getElapsedTime() {
+            long end = SystemClock.elapsedRealtime();
+            return end - startMillis;
         }
 
         public void maybeLogElapsedTime() {
             if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) {
-                long end = SystemClock.elapsedRealtime();
-                Log.d(TAG, this + " update took " + (end - startMillis) + " millis");
+                long elapsed = getElapsedTime();
+                Log.d(TAG, this + " update took " + elapsed + " millis");
             }
         }
     }
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 73b13cb..8dae1f0 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -30,6 +30,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.ContentObserver;
+import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -79,9 +80,28 @@
             new SettingsContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
-            final boolean enabled = services.contains(mComponentName);
-            mToggleSwitch.setCheckedInternal(enabled);
+            updateForServiceEnabledState();
+        }
+    };
+
+    private final DataSetObserver mDataObserver = new DataSetObserver() {
+        @Override
+        public void onChanged() {
+            invalidateOptionsMenuIfNeeded();
+        }
+
+        @Override
+        public void onInvalidated() {
+            invalidateOptionsMenuIfNeeded();
+        }
+
+        private void invalidateOptionsMenuIfNeeded() {
+            final int unfilteredItemCount = mPrintersAdapter.getUnfilteredCount();
+            if ((mLastUnfilteredItemCount <= 0 && unfilteredItemCount > 0)
+                    || mLastUnfilteredItemCount > 0 && unfilteredItemCount <= 0) {
+                getActivity().invalidateOptionsMenu();
+            }
+            mLastUnfilteredItemCount = unfilteredItemCount;
         }
     };
 
@@ -100,14 +120,21 @@
 
     private ComponentName mComponentName;
 
+    private PrintersAdapter mPrintersAdapter;
+
     // TODO: Showing sub-sub fragment does not handle the activity title
     // so we do it but this is wrong. Do a real fix when there is time.
     private CharSequence mOldActivityTitle;
 
+    private int mLastUnfilteredItemCount;
+
+    private boolean mServiceEnabled;
+
     @Override
     public void onResume() {
         mSettingsContentObserver.register(getContentResolver());
         super.onResume();
+        updateForServiceEnabledState();
     }
 
     @Override
@@ -119,9 +146,12 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        onInstallActionBarToggleSwitch();
+        installActionBarToggleSwitch();
         processArguments(getArguments());
-        getListView().setAdapter(new PrintersAdapter());
+        mPrintersAdapter = new PrintersAdapter();
+        mPrintersAdapter.registerDataSetObserver(mDataObserver);
+        getListView().setAdapter(mPrintersAdapter);
+        updateForServiceEnabledState();
     }
 
     @Override
@@ -188,7 +218,20 @@
         }
     }
 
-    protected void onInstallActionBarToggleSwitch() {
+    private void updateForServiceEnabledState() {
+        List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+        mServiceEnabled = services.contains(mComponentName);
+        if (mServiceEnabled) {
+            mToggleSwitch.setCheckedInternal(true);
+            mPrintersAdapter.enable();
+        } else {
+            mToggleSwitch.setCheckedInternal(false);
+            mPrintersAdapter.disable();
+        }
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void installActionBarToggleSwitch() {
         mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
         mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
             @Override
@@ -235,7 +278,6 @@
             if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
                 mSettingsTitle = settingsTitle;
                 mSettingsIntent = settingsIntent;
-                setHasOptionsMenu(true);
             }
         }
 
@@ -251,7 +293,6 @@
             if (!getPackageManager().queryIntentActivities(addPritnersIntent, 0).isEmpty()) {
                 mAddPrintersTitle = addPrintersTitle;
                 mAddPrintersIntent = addPritnersIntent;
-                setHasOptionsMenu(true);
             }
         }
 
@@ -266,6 +307,8 @@
         // Component name.
         mComponentName = ComponentName.unflattenFromString(arguments
                 .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));
+
+        setHasOptionsMenu(true);
     }
 
     @Override
@@ -274,33 +317,39 @@
         inflater.inflate(R.menu.print_service_settings, menu);
 
         MenuItem addPrinters = menu.findItem(R.id.print_menu_item_add_printer);
-        if (!TextUtils.isEmpty(mAddPrintersTitle) && mAddPrintersIntent != null) {
+        if (mServiceEnabled && !TextUtils.isEmpty(mAddPrintersTitle)
+                && mAddPrintersIntent != null) {
             addPrinters.setIntent(mAddPrintersIntent);
         } else {
             menu.removeItem(R.id.print_menu_item_add_printer);
         }
 
         MenuItem settings = menu.findItem(R.id.print_menu_item_settings);
-        if (!TextUtils.isEmpty(mSettingsTitle) && mSettingsIntent != null) {
+        if (mServiceEnabled && !TextUtils.isEmpty(mSettingsTitle)
+                && mSettingsIntent != null) {
             settings.setIntent(mSettingsIntent);
         } else {
             menu.removeItem(R.id.print_menu_item_settings);
         }
 
         MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
-        SearchView searchView = (SearchView) searchItem.getActionView();
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return true;
-            }
+        if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
+            SearchView searchView = (SearchView) searchItem.getActionView();
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    return true;
+                }
 
-            @Override
-            public boolean onQueryTextChange(String searchString) {
-                ((Filterable) getListView().getAdapter()).getFilter().filter(searchString);
-                return true;
-            }
-        });
+                @Override
+                public boolean onQueryTextChange(String searchString) {
+                    ((Filterable) getListView().getAdapter()).getFilter().filter(searchString);
+                    return true;
+                }
+            });
+        } else {
+            menu.removeItem(R.id.print_menu_item_search);
+        }
     }
 
     private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
@@ -347,10 +396,18 @@
 
         private CharSequence mLastSearchString;
 
-        public PrintersAdapter() {
+        public void enable() {
             getLoaderManager().initLoader(LOADER_ID_PRINTERS_LOADER, null, this);
         }
 
+        public void disable() {
+            getLoaderManager().destroyLoader(LOADER_ID_PRINTERS_LOADER);
+        }
+
+        public int getUnfilteredCount() {
+            return mPrinters.size();
+        }
+
         @Override
         public Filter getFilter() {
             return new Filter() {
@@ -480,6 +537,7 @@
             synchronized (mLock) {
                 mPrinters.clear();
                 mFilteredPrinters.clear();
+                mLastSearchString = null;
             }
             notifyDataSetInvalidated();
         }
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 52ee4fd..0ff7f4f 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -104,7 +104,17 @@
     private TtsEngines mEnginesHelper = null;
 
     private String mSampleText = "";
+
+    /**
+     * Default locale used by selected TTS engine, null if not connected to any engine.
+     */
     private Locale mCurrentDefaultLocale;
+
+    /**
+     * List of available locals of selected TTS engine, as returned by
+     * {@link TextToSpeech.Engine#ACTION_CHECK_TTS_DATA} activity. If empty, then activity
+     * was not yet called.
+     */
     private List<String> mAvailableStrLocals;
 
     /**
@@ -263,7 +273,9 @@
     }
 
     private boolean evaluateDefaultLocale() {
-        if (mCurrentDefaultLocale == null) {
+        // Check if we are connected to the engine, and CHECK_VOICE_DATA returned list
+        // of available languages.
+        if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) {
             return false;
         }
         int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
@@ -277,18 +289,17 @@
         if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) {
             defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant();
         }
-        if (mAvailableStrLocals != null) {
-            for (String loc : mAvailableStrLocals) {
-                if (loc.equalsIgnoreCase(defaultLocaleStr)) {
-                    notInAvailableLangauges = false;
-                    break;
-                }
+
+        for (String loc : mAvailableStrLocals) {
+            if (loc.equalsIgnoreCase(defaultLocaleStr)) {
+              notInAvailableLangauges = false;
+              break;
             }
         }
 
         if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED ||
                 defaultAvailable == TextToSpeech.LANG_MISSING_DATA ||
-                mAvailableStrLocals == null || notInAvailableLangauges) {
+                notInAvailableLangauges) {
             if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported.");
             updateEngineStatus(R.string.tts_status_not_supported);
             updateWidgetState(false);
@@ -557,8 +568,15 @@
         Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
 
         mAvailableStrLocals = data.getStringArrayListExtra(
-                TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
-        evaluateDefaultLocale();
+            TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        if (mAvailableStrLocals == null) {
+            Log.e(TAG, "Voice data check complete, but no available voices found");
+            // Set mAvailableStrLocals to empty list
+            mAvailableStrLocals = new ArrayList<String>();
+        }
+        if (evaluateDefaultLocale()) {
+            getSampleText();
+        }
 
         final int engineCount = mEnginePreferenceCategory.getPreferenceCount();
         for (int i = 0; i < engineCount; ++i) {
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index b83b22f..4133eb8 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -24,6 +24,8 @@
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -43,7 +45,13 @@
         if (savedInstanceState == null) {
             if (intent != null && intent.getAction()
                     .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
+                ApplicationInfo ai;
                 mApp = getCallingPackage();
+                try {
+                    PackageManager pm = getPackageManager();
+                    ai = pm.getApplicationInfo(mApp, 0);
+                    mApp = (String)pm.getApplicationLabel(ai);
+                } catch (PackageManager.NameNotFoundException e) { }
             } else {
                 finish();
                 return;