diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_access.xml
similarity index 92%
rename from res/layout/bluetooth_pb_access.xml
rename to res/layout/bluetooth_access.xml
index 01218d6..3bfb689 100644
--- a/res/layout/bluetooth_pb_access.xml
+++ b/res/layout/bluetooth_access.xml
@@ -36,12 +36,12 @@
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <CheckBox android:id="@+id/bluetooth_pb_remember_choice"
+        <CheckBox android:id="@+id/bluetooth_remember_choice"
             style="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dip"
-            android:text="@string/bluetooth_pb_remember_choice" />
+            android:text="@string/bluetooth_remember_choice" />
 
     </LinearLayout>
 
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
new file mode 100644
index 0000000..bbaf7a1
--- /dev/null
+++ b/res/layout/preference_linearcolor.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.settings.applications.LinearColorBar
+        xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:id="@+android:id/linear_color_bar"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:shadowRadius="4"
+    android:shadowColor="?android:attr/colorBackground"
+    android:shadowDx="2"
+    android:shadowDy="2">
+</com.android.settings.applications.LinearColorBar>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 243a0e6..93ea618 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Lank"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Verstek"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif gekondenseer"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Baie klein"</item>
+    <item msgid="6781094565687692782">"Klein"</item>
+    <item msgid="8222123259497646551">"Normaal"</item>
+    <item msgid="5813217276778560466">"Groot"</item>
+    <item msgid="9044232017390975191">"Baie groot"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Geen"</item>
+    <item msgid="1352974708028506778">"Raamwerk"</item>
+    <item msgid="5850876295428722675">"Val-skaduwee"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Swart op wit"</item>
+    <item msgid="1770533843436933500">"Wit op swart"</item>
+    <item msgid="1309255027325660115">"Geel op swart"</item>
+    <item msgid="2985943780939258562">"Geel op blou"</item>
+    <item msgid="7520438652121629055">"Gepasmaak"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Moet nooit toelaat dat"</item>
     <item msgid="1417929597727989746">"Laat altyd toe"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normaal"</item>
+    <item msgid="4517779899383204000">"matig"</item>
+    <item msgid="406385694840950802">"laag"</item>
+    <item msgid="4212263919458209842">"kritiek"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2321b96..8e8f882 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil jy koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Foonboek-versoek"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang hê tot jou kontakte en oproepgeskiedenis. Gee toegang aan %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Moenie weer vra nie"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Moenie weer vra nie"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Boodskapversoek"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot jou boodskappe verkry. Gee toegang aan %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tydinstellings"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Volgens streek (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Net toestelsensors"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Onlangse liggingsversoeke"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Liggingsdienste"</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_category_location_services" msgid="7437150886946685979">"Liggingdienste"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Gebruik GPS, Wi‑Fi en selnetwerke om ligging te bereken"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Gebruik Wi‑Fi en selnetwerke om ligging te bereken"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Gebruik GPS om jou ligging haarfyn aan te wys"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Haal tans op…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- en mobielenetwerk-ligging"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ligging deur Wi-Fi vasgestel"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Verander ontsluit-PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bevestig gestoorde patroon"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer weer:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Teken \'n ontsluitpatroon"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken \'n ontsluitpatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk Kieslys vir hulp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lig vinger wanneer jy klaar is."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind ten minste <xliff:g id="NUMBER">%d</xliff:g> kolletjies. Probeer weer:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patroon opgeneem."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Teken weer patroon om te bevestig:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Jou nuwe ontsluitpatroon:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lig vinger op wanneer jy klaar is"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbind minstens <xliff:g id="NUMBER">%d</xliff:g> kolletjies. Probeer weer."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Patroon opgeneem"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Teken patroon weer om te bevestig"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Jou nuwe ontsluitpatroon"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bevestig"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Teken oor"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Herprobeer"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dit sal al die voorkeure terugstel vir:\n\n "<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir handelinge"</li>\n" "<li>"Agtergronddatabeperkings vir programme"</li>\n" "<li>"Enige toestemmingbeperkings"</li>\n\n" Jy sal nie enige programdata verloor nie."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Stel programme terug"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Toeganklikheidsinstellings"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Stelsel"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Onderskrifte"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrotingsgebare"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wanneer hierdie funksie aangeskakel is, kan jy in- en uitzoem deur die skerm te trippeltik.\n \nTerwyl jy ingezoem is, kan jy:\n"<ul><li>"Swenk: Sleep twee of meer vingers oor die skerm."</li>\n<li>"Verstel zoemvlak: Knyp twee of meer vingers saam of versprei hulle uitmekaar."</li></ul>\n\n"Jy kan ook dit wat onder jou vinger is tydelik vergroot deur die skerm te trippeltik-en-hou. In daardie vergroting kan jy jou vinger sleep om verskillende dele van die skerm te verken. Lig jou vinger om terug te keer na die vorige vergroting.\n\nLet wel: trippeltik vir vergroting werk oral behalwe op die sleutelbord en navigasiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellings"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Af"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Voorskou"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standaardopsies"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Taal"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Teksgrootte"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Onderskrifstyl"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Gepasmaakte opsies"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Agtergrondkleur"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Agtergrond-ondeursigtigheid"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Tekskleur"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Randkleur"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Randtipe"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Letterfamilie"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Onderskrifte sal so lyk"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Verstek"</string>
+    <string name="color_none" msgid="3475640044925814795">"Geen"</string>
+    <string name="color_white" msgid="8045195170201590239">"Wit"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grys"</string>
+    <string name="color_black" msgid="7517353520909872561">"Swart"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rooi"</string>
+    <string name="color_green" msgid="5537717328428845841">"Groen"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blou"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Groen-blou"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Geel"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Neem jou handelinge waar"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Herlaai"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-bedryfstelsel"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediabediener"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Proses-statistieke"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Bleeksiel-statistieke vir lopende prosesse"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Berginggebruik"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Kies \'n ander enjin"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hierdie spraaksintese-enjin kan dalk al die teks versamel wat uitgespreek sal word, insluitend persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> enjin. Aktiveer die gebruik van hierdie spraaksintese-enjin?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Hierdie taal vereis \'n werkende netwerkverbinding vir teks-na-spraak-uitvoer."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dit is \'n voorbeeld van spraaksintese"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Verstek taalstatus"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> word ten volle ondersteun"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> vereis netwerkverbinding"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> word nie ondersteun nie"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Kontroleer tans…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Enjins"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> instellings"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is geaktiveer"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"skakel af"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Ligging"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkroniseer"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"outo"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Wys snitgrense, kantlyne, ens."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Dwing RTL-uitlegrigting"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Dwing skermuitlegrigting na RTL vir alle locales"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tik en betaal"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vra elke keer"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Stel as jou voorkeur?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkings"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Verwyder beperkings"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Verander PIN"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 5df2512..b1723b5 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"መካከለኛ"</item>
     <item msgid="2372711992605524591">"ረጅም"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"ነባሪ"</item>
+    <item msgid="1016452621833735880">"ጭረት-አልባ"</item>
+    <item msgid="2496277987934654454">"ጭረት-አልባ ተጨምቆ"</item>
+    <item msgid="4406003087391086325">"ባለጭረት"</item>
+    <item msgid="1558362802170124073">"ወጥ ስፋት"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"በጣም ትንሽ"</item>
+    <item msgid="6781094565687692782">"ትንሽ"</item>
+    <item msgid="8222123259497646551">"መደበኛ"</item>
+    <item msgid="5813217276778560466">"ትልቅ"</item>
+    <item msgid="9044232017390975191">"በጣም ትልቅ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"ምንም የለም"</item>
+    <item msgid="1352974708028506778">"ቢጋር"</item>
+    <item msgid="5850876295428722675">"ጥላጣል"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"ጥቁር በነጭ ላይ"</item>
+    <item msgid="1770533843436933500">"ነጭ በጥቁር ላይ"</item>
+    <item msgid="1309255027325660115">"ቢጫ በጥቁር ላይ"</item>
+    <item msgid="2985943780939258562">"ቢጫ በሰማያዊ ላይ"</item>
+    <item msgid="7520438652121629055">"ብጁ"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"በጭራሽ አትፍቀድ"</item>
     <item msgid="1417929597727989746">"ሁልጊዜ ፍቀድ"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"መደበኛ"</item>
+    <item msgid="4517779899383204000">"መጠነኛ"</item>
+    <item msgid="406385694840950802">"ዝቅተኛ"</item>
+    <item msgid="4212263919458209842">"አሳሳቢ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 44929ab..934ac65 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ወደ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለማያያዝ ይፈልጋሉ?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"የስልክ አድራሻ ጠይቅ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ዳግመኛ አትጠይቅ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"የመልዕክት ጥያቄ"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s የእርስዎን መልዕክቶች ሊደርስበት ይፈልጋል። መዳረሻ ለ%2$s ይሰጥ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"የቀን እና ሰዓት ቅንብሮች"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል መቆጠብ"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"የመሣሪያ ዳሳሽ አካላት ብቻ"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"አካባቢ ጠፍቷል"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"የአካባቢ አገልግሎቶች"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"አካባቢ ለመገመት ጂ ፒ ኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"አካባቢን ለመገመት Wi‑Fiን እና የተቀሳቃሽ ስልክ አውታረ መረቦችን ይጠቀሙ"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"አካባቢዎን ለመለየት ጂ ፒ ኤስ ይጠቀሙ"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"ሰርስሮ በማውጣት ላይ…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"የWi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ PIN ለውጥ"</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="2063630508212535241">"የመክፈቻ ስርዓተ ንጥል ይሳሉ"</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="4622772178078818425">"ሲጨርሱ ጣትዎን ይልቀቁ"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"ቢያንስ <xliff:g id="NUMBER">%d</xliff:g> ነጥቦች አያይዝ። እንገደና ሞክር፡"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"ስርዓተ ጥለት ተመዝግቧል።"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"ለማረጋገጥ ስርዓተ ጥለት ድጋሚ ሳል፡"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"አዲሱ የመክፈቻ ስርዓተ ጥለትዎ፡"</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_confirm_button_text" msgid="1128204343957002841">"አረጋግጥ"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"ድጋሚ ሳል"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"እንደገና ሞክር"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ይሄ ሁሉንም የእነኚህ ምርጫዎችን ዳግም ያስጀምራቸዋል፦\n\n "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ መተግበሪያ ማሳወቂያዎች"</li>\n" "<li>"ለሁሉም እርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n" "<li>"ማንኛቸውም የፍቃድ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አይጠፋብዎትም።"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"መተግበሪያዎችን ዳግም አስጀምር"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ተደራሽነት ቅንብሮች"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"አገልግሎቶች"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"ስርዓት"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"መግለጫ ፅሑፎች"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"የማጉላት ምልክቶች"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"ይሄ ባህሪ ሲበራ ማያ ገጹን ሶስቴ መታ በማድረግ ማጉላት እና ማሳነስ ይችላሉ።\n\nአጉልተው ሳሉ እነኚህን ማድረግ ይችላሉ፦\n"<ul><li>"ማንፏቀቅ፦ በማያ ገጹ ላይ ሁለት ወይም ተጨማሪ ጣቶችን ይጎትቱ።"</li>\n<li>"የአጉላ ደረጃን ማስተካከል፦ በሁለት ወይም ተጨማሪ ጣቶች ይቆንጥጡ ወይም ጣቶችዎን ይበትኗቸው።"</li></ul>\n\n"እንዲሁም ሶስቴ መታ በማድረግና በመያዝ ከጣትዎ ስር ያለውን በጊዜያዊነት ማጉላት ይችላሉ። በዚህ የማጉላት ሁኔታ ላይ የማያ ገጹ የተለያዩ ክፍሎችን ለማሰስ ጣትዎን መጎተት ይችላሉ። ወደ ቀዳሚ ሁኔታዎን ለመመለስ ጣትዎን ያንሱ።\n\nማስታወሻ፦ ከቁልፍ ሰሌዳው እና የአሰሳ አሞሌው በስተቀር ለማጉላት ሶስቴ መታ ማድረግ በሁሉም ቦታ ላይ ይሰራል።"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"የተደራሽነት አቋራጭ"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ቅንብሮች"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"በርቷል"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ጠፍቷል"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"ቅድመ-ዕይታ"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"መደበኛ አማራጮች"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"ቋንቋ"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"የፅሁፍ መጠን"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"የመግለጫ ጽሑፍ ቅጥ"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ብጁ አማራጮች"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"የጀርባ ቀለም"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"የጀርባ ግልጽነት"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"የጽሁፍ ቀለም"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"የጠርዝ ቀለም"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"የጠርዝ አይነት"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"የቅርጸ ቁምፊ ቤተሰብ"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"መግለጫ ጽሑፎች እንዲህ ነው የሚመስሉት"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"ነባሪ"</string>
+    <string name="color_none" msgid="3475640044925814795">"ምንም የለም"</string>
+    <string name="color_white" msgid="8045195170201590239">"ነጭ"</string>
+    <string name="color_gray" msgid="9192312087142726313">"ግራጫ"</string>
+    <string name="color_black" msgid="7517353520909872561">"ጥቁር"</string>
+    <string name="color_red" msgid="4949354900304125428">"ቀይ"</string>
+    <string name="color_green" msgid="5537717328428845841">"አረንጓዴ"</string>
+    <string name="color_blue" msgid="7731984529016953223">"ሰማያዊ"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"ሳያን"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"ቢጫ"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"ማጀንታ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"እርምጃዎችዎን ይከታተሉ"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"አድስ"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android  ስርዓተ ክወና"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረ መረጃ አገልጋይ"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"የሂደት ስታቲስቲክስ"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"እያሄዱ ስላሉ ሂደቶች ያሉ ዝርዝር ስታቲስቲክስ"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"የማህደረ ትውስታ አጠቃቀም"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ሌላ አንቀሳቃሽ ምረጥ"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ይህ የንግግር ልምምድ አንቀሳቃሽ የሚነገረውን ፅሁፍ ሁሉ  እንደ ይለፍ ቃል እና የዱቤ ካርድ ቁጥሮች፣ የግል ውሂብ ጨምሮ ለመሰብሰብ ይችል ይሆናል።  ከ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> አንቀሳቃሽ ይመጣል። የዚህን የንግግር ልምምድ አንቀሳቃሽ አጠቃቀም ይንቃ?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"ይህ ቋንቋ የጽሑፍ-ወደ-ንግግር ውጽዓት እንዲኖረው የሚሰራ የአውታረ መረብ ግንኙነት ያስፈልገዋል።"</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"ይህ የተሰራ ንግግር ምሳሌ ነው"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"የነባሪ ቋንቋ ሁኔታ"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> ሙሉ ለሙሉ ይደገፋል"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> የአውታረ መረብ ግንኙነት ያስፈልጋል"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> አይደገፍም"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"በማረጋገጥ ላይ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"አንቀሳቃሾች"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ቅንብሮች"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ተችሏል"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"በማጥፋት ላይ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ብሉቱዝ"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"አካባቢ"</string>
     <string name="gadget_sync" msgid="858895763714222152">"አመሳስል"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ብሩህነት <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ራስ-ሰር"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"የ OpenGL ክትትሎችን ያንቁ"</string>
     <string name="debug_layout" msgid="5981361776594526155">"የአቀማመጥ ገደቦችን አሳይ"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"የቅንጥብ ገደቦች፣ ጠርዞች፣ ወዘተ አሳይ"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"የቀኝ-ወደ-ግራ አቀማመጥ አቅጣጫ አስገድድ"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ለሁሉም አካባቢዎች የማያ ገጽ አቀማመጥ ከቀኝ-ወደ-ግራ እንዲሆን አስገድድ"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"የCPU አጠቃቀም አሳይ"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"መታ ያድርጉ እና ይክፈሉ"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"ሁልጊዜ ጊዜ ጠይቅ"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"እንደ ምርጫዎ ሆኖ ይዘጋጅ?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"ገደቦች"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ገደቦችን አስወግድ"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"ፒን ቀይር"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index b7326eb..58aec76 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"متوسطة"</item>
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"افتراضي"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif مكثف"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"صغير جدًا"</item>
+    <item msgid="6781094565687692782">"صغير"</item>
+    <item msgid="8222123259497646551">"عادي"</item>
+    <item msgid="5813217276778560466">"كبير"</item>
+    <item msgid="9044232017390975191">"كبير جدًا"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"بدون"</item>
+    <item msgid="1352974708028506778">"مخطط"</item>
+    <item msgid="5850876295428722675">"ظل خلفي"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"أسود في أبيض"</item>
+    <item msgid="1770533843436933500">"أبيض في أسود"</item>
+    <item msgid="1309255027325660115">"أصفر في أسود"</item>
+    <item msgid="2985943780939258562">"أصفر في أزرق"</item>
+    <item msgid="7520438652121629055">"مخصص"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"عدم السماح مطلقًا"</item>
     <item msgid="1417929597727989746">"السماح دومًا"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"عادية"</item>
+    <item msgid="4517779899383204000">"معتدلة"</item>
+    <item msgid="406385694840950802">"منخفضة"</item>
+    <item msgid="4212263919458209842">"حرجة"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cf02cbc..cf2d8a0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"طلب دفتر الهاتف"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"يريد %1$s الدخول إلى جهات الاتصال وسجل المكالمات. هل تريد منحه حق الدخول إلى %2$s؟"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"لا تسألني مرة أخرى"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"لا تسألني مرة أخرى"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"طلب الرسالة"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"يريد %1$s الدخول إلى رسائلك. هل تريد منح %2$s حق الدخول؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"إقليمي (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقة عالية"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"توفير شحن البطارية"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"أجهزة استشعار الجهاز فقط"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"الموقع قيد الإيقاف"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"طلبات الموقع الأخيرة"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"خدمات الموقع"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS وشبكات جوّال لتقدير الموقع"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi-Fi وشبكة جوال لتقدير الموقع"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"استخدام GPS لتحديد موقعك"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"جارٍ الاسترداد…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"شبكة Wi-Fi وموقع شبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <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_wrong" msgid="4694973540770105678">"أعد المحاولة:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"رسم نمط إلغاء القفل:"</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="4622772178078818425">"تحرير الإصبع عند الانتهاء."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. حاول مرة أخرى:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"تم تسجيل النقش."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"رسم النقش مرة أخرى للتأكيد:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"نقش إلغاء تأمينك الجديد:"</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_confirm_button_text" msgid="1128204343957002841">"تأكيد"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"إعادة الرسم"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"إعادة المحاولة"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"عرض العمليات المخزنة مؤقتًا"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود البيانات الخلفية للتطبيقات"</li>\n" "<li>"أي قيود أذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"إعدادات إمكانية الدخول"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"الخدمات"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"النظام"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"التسميات التوضيحية"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"إيماءات التكبير"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"عند تشغيل هذه الميزة، يمكنك التكبير والتصغير بالنقر نقرًا ثلاثيًا على الشاشة.\n\nأثناء التكبير، يمكنك إجراء التالي:\n"<ul><li>"التدوير: اسحب إصبعين أو أكثر على الشاشة."</li>\n<li>"ضبط مستوى التكبير/التصغير: اضغط بإصبعين أو أكثر معًا أو باعد بينهم."</li></ul>\n\n"كما يمكنك أيضًا التكبير المؤقت لما يقع تحت إصبعك بالنقر نقرًا ثلاثيًا مع الاستمرار. في حالة التكبير هذه، يمكنك سحب إصبعك لاستكشاف الأجزاء المختلفة من الشاشة. ارفع إصبعك للعودة إلى الحالة السابقة.\n\nملاحظة: يعمل النقر نقرًا ثلاثيًا للتكبير في أي مكان ماعدا لوحة المفاتيح وشريط التنقل."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"اختصارات تسهيل الدخول"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"الإعدادات"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"تشغيل"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"إيقاف"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"معاينة"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"خيارات قياسية"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"اللغة"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"حجم النص"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"نمط التسمية التوضيحية"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"خيارات مخصصة"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"لون الخلفية"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"تعتيم الخلفية"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"لون النص"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"لون الحافة"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"نوع الحافة"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"مجموعة الخطوط"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"ستبدو التسميات التوضيحية بالشكل التالي"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"افتراضي"</string>
+    <string name="color_none" msgid="3475640044925814795">"بدون"</string>
+    <string name="color_white" msgid="8045195170201590239">"أبيض"</string>
+    <string name="color_gray" msgid="9192312087142726313">"رمادي"</string>
+    <string name="color_black" msgid="7517353520909872561">"أسود"</string>
+    <string name="color_red" msgid="4949354900304125428">"أحمر"</string>
+    <string name="color_green" msgid="5537717328428845841">"أخضر"</string>
+    <string name="color_blue" msgid="7731984529016953223">"أزرق"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"سماوي"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"أصفر"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"أرجواني"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ملاحظة الإجراءات"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"تحديث"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"نظام التشغيل Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"خادم الوسائط"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"إحصائيات العمليات"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"الإحصائيات التقنية حول العمليات الجارية"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"استخدام الذاكرة"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"اختيار محرك آخر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ربما يمكن لمحرك اصطناع الحديث جمع كل النص التي سيتم نطقه، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقة الائتمان. يتم إحضار ذلك من المحرك <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. هل تريد تمكين استخدام محرك اصطناع الحديث هذا؟"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"تتطلب هذه اللغة اتصال شبكة سليمًا لتحويل النص إلى كلام."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"هذا مثال لتركيب الكلام"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"حالة اللغة الافتراضية"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> متوافقة تمامًا"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> تتطلب اتصالاً بالشبكة"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> غير متوافقة"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"جارٍ التحقق..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"المحركات"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"إعدادات <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"تم تمكين <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"جارٍ إيقاف التشغيل"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"الموقع"</string>
     <string name="gadget_sync" msgid="858895763714222152">"المزامنة"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"السطوع <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"تلقائي"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"تمكين عمليات تتبع OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"عرض حدود المخطط"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"عرض حدود وهوامش المقطع وما إلى ذلك."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"فرض اتجاه التخطيط ليكون RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"فرض اتجاه تخطيط الشاشة ليكون RTL لجميع اللغات"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"عرض استخدام CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض رسومات GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"التوصيل والدفع"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"الطلب في كل مرة"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"هل تريد تعيينه كتفضيل؟"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"إزالة القيود"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رقم التعريف الشخصي"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 7545404..2ba21a7 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -245,6 +245,28 @@
     <item msgid="2560532955514699713">"Сярэдні"</item>
     <item msgid="2372711992605524591">"Доўгі"</item>
   </string-array>
+    <!-- no translation found for captioning_typeface_selector_titles:0 (1319652728542138112) -->
+    <!-- no translation found for captioning_typeface_selector_titles:1 (1016452621833735880) -->
+    <!-- no translation found for captioning_typeface_selector_titles:2 (2496277987934654454) -->
+    <!-- no translation found for captioning_typeface_selector_titles:3 (4406003087391086325) -->
+    <!-- no translation found for captioning_typeface_selector_titles:4 (1558362802170124073) -->
+    <!-- no translation found for captioning_font_size_selector_titles:0 (4800919809575254054) -->
+    <!-- no translation found for captioning_font_size_selector_titles:1 (6781094565687692782) -->
+    <!-- no translation found for captioning_font_size_selector_titles:2 (8222123259497646551) -->
+    <!-- no translation found for captioning_font_size_selector_titles:3 (5813217276778560466) -->
+    <!-- no translation found for captioning_font_size_selector_titles:4 (9044232017390975191) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:0 (6022616153255438487) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:1 (1352974708028506778) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:2 (5850876295428722675) -->
+    <!-- no translation found for captioning_opacity_selector_titles:0 (7622491218136667566) -->
+    <!-- no translation found for captioning_opacity_selector_titles:1 (2367156416247936773) -->
+    <!-- no translation found for captioning_opacity_selector_titles:2 (5395560410107149298) -->
+    <!-- no translation found for captioning_opacity_selector_titles:3 (8342334626783983353) -->
+    <!-- no translation found for captioning_preset_selector_titles:0 (4449370095159630210) -->
+    <!-- no translation found for captioning_preset_selector_titles:1 (1770533843436933500) -->
+    <!-- no translation found for captioning_preset_selector_titles:2 (1309255027325660115) -->
+    <!-- no translation found for captioning_preset_selector_titles:3 (2985943780939258562) -->
+    <!-- no translation found for captioning_preset_selector_titles:4 (7520438652121629055) -->
     <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
     <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
     <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
@@ -345,4 +367,8 @@
     <item msgid="5077768429488260031">"Нiколi не дазваляць"</item>
     <item msgid="1417929597727989746">"Заўсёды дазваляць"</item>
   </string-array>
+    <!-- no translation found for ram_states:0 (7088762389498381203) -->
+    <!-- no translation found for ram_states:1 (4517779899383204000) -->
+    <!-- no translation found for ram_states:2 (406385694840950802) -->
+    <!-- no translation found for ram_states:3 (4212263919458209842) -->
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5b2954f..7b5b20f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -165,7 +165,13 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Падлучыцца да прылады \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запыт тэлефоннай кнігі"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s спрабуе атрымаць доступ да вашых кантактаў і гісторыі выклікаў. Дазволіць доступ тэлефоннай кнiзе %2$s?"</string>
+    <!-- no translation found for bluetooth_remember_choice (6198284561603824931) -->
+    <skip />
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больш не пытацца"</string>
+    <!-- no translation found for bluetooth_map_request (1541931183213124878) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
+    <skip />
     <string name="date_and_time" msgid="4114084177056654663">"Налады даты і часу"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Рэгіянальны фармат даты (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -999,10 +1005,16 @@
     <skip />
     <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
     <skip />
+    <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
+    <skip />
     <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
     <skip />
     <!-- no translation found for location_category_location_services (7437150886946685979) -->
     <skip />
+    <!-- no translation found for location_high_battery_use (517199943258508020) -->
+    <skip />
+    <!-- no translation found for location_low_battery_use (8602232529541903596) -->
+    <skip />
     <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
     <skip />
     <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
@@ -1011,6 +1023,8 @@
     <skip />
     <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
     <skip />
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дазвольце прыкладанням выкарыстоўваць службу вызначэння месцазнаходжання, каб хутчэй вас знаходзiць. Ананiмныя дадзеныя пра месцазнаходжанне будуць збiрацца i адпраўляцца ў Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Месцазнаходжанне вызначаецца праз Wi-Fi"</string>
@@ -1058,13 +1072,18 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Змяніць PIN-код разблакавання"</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="2063630508212535241">"Выканайце камбінацыю разблакiроўкі"</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="4622772178078818425">"Адпусціце палец, калі скончыце."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Злучыце па меншай меры <xliff:g id="NUMBER">%d</xliff:g> кропак. Паспрабуйце яшчэ раз:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Шаблон запісаны."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Каб пацвердзiць, выканайце камбінацыю яшчэ раз:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Вашая новая камбінацыя разблакоўкі:"</string>
+    <!-- no translation found for lockpattern_recording_inprogress (6667844062721656773) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (1348234155120957561) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (4316818983675591604) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (8054853451639221265) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (8455614172231880211) -->
+    <skip />
     <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>
@@ -1377,6 +1396,8 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налады спецыяльных магчымасцей"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Сістэма"</string>
+    <!-- no translation found for accessibility_captioning_title (7589266662024836291) -->
+    <skip />
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жэсты павелiчэння"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Калi гэта функцыя ўключана, можна наблiжаць i аддаляць, тройчы нацiснуўшы на экран.\n\nНаблiзiйшы, можна:\n"<ul><li>"Панарама: працягнiце два цi больш пальцаў па экране."</li>\n<li>"Дадаць узровень наблiжэння: звядзiце пальцы або развядзiце ў розныя бакi."</li></ul>\n\n"Таксама можна часова павялiчыць тое, што пад пальцам, тройчы нацiснуўшы i ўтрымлiваючы. У павялiчаным стане можна працягнуць палец, каб адкрыць iншыя часткi экрана. Паднiмiце палец, каб вярнуцца да папярэдняга.\n\nМайце на ўвазе: патройнае нацiсканне працуе паўсюль, акрамя клавiятуры i панэлi навiгацыi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Цэтлiк даступнасцi"</string>
@@ -1393,6 +1414,56 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налады"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"На"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Адключана"</string>
+    <!-- no translation found for captioning_preview_title (1234015253497016890) -->
+    <skip />
+    <!-- no translation found for captioning_standard_options_title (3284211791180335844) -->
+    <skip />
+    <!-- no translation found for captioning_locale (4559155661018823503) -->
+    <skip />
+    <!-- no translation found for captioning_text_size (6737002449104466028) -->
+    <skip />
+    <!-- no translation found for captioning_preset (8939737196538429044) -->
+    <skip />
+    <!-- no translation found for captioning_custom_options_title (5067500939930322405) -->
+    <skip />
+    <!-- no translation found for captioning_background_color (9053011212948992570) -->
+    <skip />
+    <!-- no translation found for captioning_background_opacity (6029993616419971202) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_color (85623486537640059) -->
+    <skip />
+    <!-- no translation found for captioning_edge_color (3670094753735263238) -->
+    <skip />
+    <!-- no translation found for captioning_edge_type (5997247394951682154) -->
+    <skip />
+    <!-- no translation found for captioning_typeface (1826169240566563259) -->
+    <skip />
+    <!-- no translation found for captioning_preview_text (4067935959797375065) -->
+    <skip />
+    <!-- no translation found for captioning_preview_characters (7105909138497851769) -->
+    <skip />
+    <!-- no translation found for locale_default (2593883646136326969) -->
+    <skip />
+    <!-- no translation found for color_none (3475640044925814795) -->
+    <skip />
+    <!-- no translation found for color_white (8045195170201590239) -->
+    <skip />
+    <!-- no translation found for color_gray (9192312087142726313) -->
+    <skip />
+    <!-- no translation found for color_black (7517353520909872561) -->
+    <skip />
+    <!-- no translation found for color_red (4949354900304125428) -->
+    <skip />
+    <!-- no translation found for color_green (5537717328428845841) -->
+    <skip />
+    <!-- no translation found for color_blue (7731984529016953223) -->
+    <skip />
+    <!-- no translation found for color_cyan (7033027180641173211) -->
+    <skip />
+    <!-- no translation found for color_yellow (9112680561610873529) -->
+    <skip />
+    <!-- no translation found for color_magenta (5059212823607815549) -->
+    <skip />
     <string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Неабходна: <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Назірайце за сваімi дзеяннямi"</string>
@@ -1500,6 +1571,16 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Абнавіць"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"АС Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медыя"</string>
+    <!-- no translation found for process_stats_summary_title (1144688045609771677) -->
+    <skip />
+    <!-- no translation found for process_stats_summary (109387941605607762) -->
+    <skip />
+    <!-- no translation found for app_memory_use (7849258480392171939) -->
+    <skip />
+    <!-- no translation found for process_stats_total_duration (663196332079061529) -->
+    <skip />
+    <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
+    <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>
@@ -1543,6 +1624,8 @@
     <skip />
     <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
     <skip />
+    <!-- no translation found for tts_status_checking (4983413982985913047) -->
+    <skip />
     <string name="tts_engines_section" msgid="7515470972378742429">"Модулi"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налады модулю <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Модуль <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> уключаны"</string>
@@ -1569,7 +1652,8 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключэнне"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <!-- no translation found for gadget_location (2974757497945178165) -->
+    <skip />
     <string name="gadget_sync" msgid="858895763714222152">"Сінхранiзацыя"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Яркасць: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аўта"</string>
@@ -1753,6 +1837,10 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Уключэнне слядоў OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Паказаць межы размяшчэння"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Паказаць межы кліпу, палі і г. д."</string>
+    <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+    <skip />
     <string name="show_cpu_usage" msgid="2389212910758076024">"Паказаць выкарыстанне ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад на экран з бягучым выкарыстаннем працэсара"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Прымусовае адлюстраванне GPU"</string>
@@ -1945,6 +2033,12 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змяніць памер шрыфту"</string>
+    <!-- no translation found for nfc_payment_settings_title (4226098386809754689) -->
+    <skip />
+    <!-- no translation found for nfc_payment_ask (1061129391464251903) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (1583397933053078296) -->
+    <skip />
     <!-- no translation found for restriction_settings_title (4233515503765879736) -->
     <skip />
     <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 9ccedf0..7da59f3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Средно"</item>
     <item msgid="2372711992605524591">"Продължително"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Стандартни"</item>
+    <item msgid="1016452621833735880">"Безсерифни"</item>
+    <item msgid="2496277987934654454">"Безсерифни сбити"</item>
+    <item msgid="4406003087391086325">"Серифни"</item>
+    <item msgid="1558362802170124073">"Непропорционални"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Много малък"</item>
+    <item msgid="6781094565687692782">"Малък"</item>
+    <item msgid="8222123259497646551">"Нормален"</item>
+    <item msgid="5813217276778560466">"Голям"</item>
+    <item msgid="9044232017390975191">"Много голям"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Без"</item>
+    <item msgid="1352974708028506778">"Контур"</item>
+    <item msgid="5850876295428722675">"Падаща сянка"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Черно върху бяло"</item>
+    <item msgid="1770533843436933500">"Бяло върху черно"</item>
+    <item msgid="1309255027325660115">"Жълто върху черно"</item>
+    <item msgid="2985943780939258562">"Жълто върху синьо"</item>
+    <item msgid="7520438652121629055">"Персонализирано"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Никога да не се разрешава"</item>
     <item msgid="1417929597727989746">"Винаги да се разрешава"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"нормално"</item>
+    <item msgid="4517779899383204000">"средно"</item>
+    <item msgid="406385694840950802">"лошо"</item>
+    <item msgid="4212263919458209842">"критично"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2a8acd1..ddf0408 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Заявка за телефонен указател"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"От %1$s се иска достъп до вашите контакти и история на обажданията. Да се даде ли достъп до %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Без повторно питане"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Без повторно питане"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Заявка за достъп до съобщенията"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s иска достъп до съобщенията ви. Ще предоставите ли достъп до %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензорите на устройството"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Местоположението е изключено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Скорошни заявки за местопол."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуги за местоположение"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Прибл. устан. на местопол. чрез GPS, Wi‑Fi и моб. мрежи"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Прибл. устан. на местопол. чрез Wi‑Fi и моб. мрежи"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Посочване на местопол. чрез GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Mестоп. от Wi‑Fi и моб. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промяна на PIN кода за отключване"</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="2063630508212535241">"Начертайте фигура за отключване:"</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="4622772178078818425">"Махнете пръста си, когато сте готови"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Свържете поне <xliff:g id="NUMBER">%d</xliff:g> точки. Опитайте отново:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Фигурата е записана."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Начертайте фигурата отново за потвърждение:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новата ви фигура за отключване:"</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_confirm_button_text" msgid="1128204343957002841">"Потвърждаване"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Повторно начертаване"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повторен опит"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Кеширани процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Да се нулират предпоч.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Това ще нулира всички предпочитания за:\n\n "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията за данни на заден план за приложенията;"</li>\n" "<li>"ограниченията за всички разрешения."</li>\n\n" Няма да загубите данни от приложенията."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Нулиране на приложенията"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки за достъпност"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Надписи"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жестове за увеличение"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Когато тази функция е включена, можете да увеличите или намалите мащаба, като докоснете екрана три пъти.\n\nПри увеличен мащаб можете:\n"<ul><li>"Да извършите панорамно преместване: Плъзнете два или повече пръста по екрана."</li>\n<li>"Да коригирате нивото на мащаба: Съберете заедно или разгънете два или повече пръста."</li></ul>\n\n"Можете също временно да промените мащаба на това, което е под пръста ви, като докоснете три пъти и задържите. В това променено състояние можете да плъзнете пръста си, за да изследвате различни части на екрана. Вдигнете го, за да се върнете към предишното състояние.\n\nЗабележка: Докосването три пъти за промяна на мащаба работи навсякъде освен при клавиатурата и навигационната лента."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пряк път към ф-ята за достъпност"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Вкл."</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Изкл."</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Визуализация"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Стандартни опции"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Език"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Размер на текста"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Стил на надписите"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Персонализирани опции"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Цвят на фона"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Плътност на фона"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Цвят на текста"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Цвят на контура"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Тип на контура"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Семейство шрифтове"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Надписите ще изглеждат така"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"По подразбиране"</string>
+    <string name="color_none" msgid="3475640044925814795">"Без"</string>
+    <string name="color_white" msgid="8045195170201590239">"Бял"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Сив"</string>
+    <string name="color_black" msgid="7517353520909872561">"Черен"</string>
+    <string name="color_red" msgid="4949354900304125428">"Червен"</string>
+    <string name="color_green" msgid="5537717328428845841">"Зелен"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Син"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Синьозелен"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Жълт"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Пурпурен"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> има нужда от следните неща:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Наблюдение на действията ви"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Опресняване"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android операционна система"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Медиен сървър"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистически данни за процесите"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Подробни статистически данни за изпълняващите се процеси"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Използвана памет"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Избор на друга машина"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Тази машина за синтезиране на реч може да събира всички изговорено от вас, включително лични данни като пароли и номера на кредитни карти. Тя произлиза от машината <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Искате ли да я активирате?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Този език изисква работеща връзка с мрежата за синтезирания говор."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Това е пример за синтезиране на говор"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Състояние на основния език"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> се поддържа напълно"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"За <xliff:g id="LOCALE">%1$s</xliff:g> се изисква връзка с мрежа"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не се поддържа"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Проверява се..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Машини"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Настройки за <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е активирано"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"изключва сe"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Местоположение"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизиране"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Яркост: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автоматична"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Принуд. оформл. отдясно наляво"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Принуд. оформл. на екрана отдясно наляво за вс. локали"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудително изобразяване"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Докоснете и платете"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Да се пита винаги"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Да се зададе ли като ваше предпочитание?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Oграничения: Премахване"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промяна на ПИН кода"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 59258a8..ff535e5 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Mitjà"</item>
     <item msgid="2372711992605524591">"Llarg"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predeterminat"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensada"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monoespaiada"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Molt petit"</item>
+    <item msgid="6781094565687692782">"Petit"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Gran"</item>
+    <item msgid="9044232017390975191">"Molt gran"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Cap"</item>
+    <item msgid="1352974708028506778">"Perfilat"</item>
+    <item msgid="5850876295428722675">"Ombra"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Negre sobre fons blanc"</item>
+    <item msgid="1770533843436933500">"Blanc sobre fons negre"</item>
+    <item msgid="1309255027325660115">"Groc sobre fons negre"</item>
+    <item msgid="2985943780939258562">"Groc sobre fons blau"</item>
+    <item msgid="7520438652121629055">"Personalitzat"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"No permetis mai"</item>
     <item msgid="1417929597727989746">"Permet sempre"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderada"</item>
+    <item msgid="406385694840950802">"baixa"</item>
+    <item msgid="4212263919458209842">"molt baixa"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e13be79..1a87ecb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vols connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Sol·licitud de llibreta de telèfons"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A %1$s li agradaria accedir als teus contactes i a l\'historial de trucades. Vols donar accés a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No m\'ho tornis a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No m\'ho tornis a preguntar"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Sol·licitud de missatge"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuració de data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Gran precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Només sensors de dispositiu"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Sol·licituds d\'ubicació rec."</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_category_location_services" msgid="7437150886946685979">"Serveis d\'ubicació"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Molt ús de bateria"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Poc ús de bateria"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Mode d\'ubicació"</string>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Ús de GPS, Wi‑Fi i xarxes mòbils per calcular ubic."</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Ús de Wi-Fi i xarxes mòbils per calcular la ubic."</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ús de GPS per determinar ubic."</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Ubicació p. Wi-Fi i xarxa mòb."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicació determinada per Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmeu el patró desat"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Torna-ho a provar:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dibuixa un patró de desbloqueig:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuixeu un perfil de desbloqueig"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solteu el dit en acabar."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connecteu <xliff:g id="NUMBER">%d</xliff:g> punts com a mínim. Torneu-ho a provar:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patró enregistrat."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Torneu a dibuixar el patró per confirmar-lo:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Patró de desbloqueig nou:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Deixa anar el dit en acabar"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Connecta <xliff:g id="NUMBER">%d</xliff:g> punts com a mínim. Torna-ho a provar."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Patró enregistrat"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Torna a dibuixar el patró per confirmar-lo"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Patró de desbloqueig nou"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirma"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Torna a dibuixar"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Reintenta"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix preferències"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vols rest. pref. aplic.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Amb aquesta acció, es restabliran les preferències dels elements següents:\n\n "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions d\'aplicacions desactivades"</li>\n" "<li>"Aplicacions predeterminades per a les accions"</li>\n" "<li>"Restriccions de dades en segon pla per a les aplicacions"</li>\n" "<li>"Restriccions de permisos"</li>\n\n" No perdràs les dades de les aplicacions."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restableix les aplicac."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestiona l\'espai"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos d\'ampliació"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quan aquesta funció està activada, pots ampliar o allunyar si piques tres cops la pantalla.\n\nQuan ampliïs, pots fer el següent.\n"<ul><li>"Panoràmica: arrossega dos dits o més per la pantalla."</li>\n<li>"Ajustar el nivell de zoom: apropa dos o més dits o bé separa\'ls."</li></ul>\n\n"També pots ampliar de manera temporal el que tinguis a sota del dit si piques tres cops i mantens premut. En aquest estat ampliat, pots arrossegar el dit per explorar diverses parts de la pantalla. Aixeca el dit per tornar a l\'estat previ.\n\nNota: Pica tres cops per ampliar a tot arreu tret de la barra de navegació i el teclat."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivat"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Visualització prèvia"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opcions estàndard"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Mida del text"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Estil de subtítol"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opcions personalitzades"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Color de fons"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacitat del fons"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Color del text"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Color de contorn"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipus de contorn"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Família de tipus de lletra"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Els subtítols tindran aquest aspecte"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predeterminat"</string>
+    <string name="color_none" msgid="3475640044925814795">"Cap"</string>
+    <string name="color_white" msgid="8045195170201590239">"Blanc"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gris"</string>
+    <string name="color_black" msgid="7517353520909872561">"Negre"</string>
+    <string name="color_red" msgid="4949354900304125428">"Vermell"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verd"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blau"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Groc"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar les teves accions"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualitza"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimèdia"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadístiques sobre processos"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Estadístiques sobre els processos en execució"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Ús de la memòria"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecciona un altre motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Pot ser que aquest motor de síntesi de la parla pugui recopilar tot el text que es dirà en veu alta, incloses les dades personals, com ara les contrasenyes i els números de les targetes de crèdit. Ve del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voleu activar l\'ús d\'aquest motor de síntesi de la parla?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Aquest idioma requereix una connexió activa a la xarxa per generar síntesi de veu."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Això és un exemple de síntesi de veu"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Estat de l\'idioma predeterminat"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> és totalment compatible"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Es necessita una connexió de xarxa per a <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> no és compatible"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"S\'està comprovant..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motors"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuració de: <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> està activat"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"s\'està desactivant…"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Ubicació"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronització"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brillantor: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automàtica"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de disseny"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Força disseny dreta-esq."</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Força disseny pantalla dreta-esq. totes config."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Toca i paga"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Pregunta sempre"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vols establir-ho com a preferència?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restriccions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Suprimeix restriccions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 117f7f3..8f009e1 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Střední"</item>
     <item msgid="2372711992605524591">"Dlouhá"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Výchozí"</item>
+    <item msgid="1016452621833735880">"Bezpatkové"</item>
+    <item msgid="2496277987934654454">"Bezpatkové zúžené"</item>
+    <item msgid="4406003087391086325">"Patkové"</item>
+    <item msgid="1558362802170124073">"Neproporcionální"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Velmi malé"</item>
+    <item msgid="6781094565687692782">"Malé"</item>
+    <item msgid="8222123259497646551">"Normální"</item>
+    <item msgid="5813217276778560466">"Velké"</item>
+    <item msgid="9044232017390975191">"Velmi velké"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Žádné"</item>
+    <item msgid="1352974708028506778">"Obrys"</item>
+    <item msgid="5850876295428722675">"Stín"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Černé na bílém"</item>
+    <item msgid="1770533843436933500">"Bílé na černém"</item>
+    <item msgid="1309255027325660115">"Žluté na černém"</item>
+    <item msgid="2985943780939258562">"Žluté na modrém"</item>
+    <item msgid="7520438652121629055">"Vlastní"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nepovolit nikdy"</item>
     <item msgid="1417929597727989746">"Vždy povolit"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normální"</item>
+    <item msgid="4517779899383204000">"střední"</item>
+    <item msgid="406385694840950802">"nízké"</item>
+    <item msgid="4212263919458209842">"kritické"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6b78e62..2f6d7f7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete se připojit k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Požadavek telefonního seznamu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zařízení %1$s žádá o přístup k vašim kontaktům a historii hovorů. Povolit zařízení %2$s přístup?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Příště se neptat"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Příště se neptat"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Žádost o zprávu"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zařízení %1$s žádá o přístup k vašim zprávám. Povolit přístup zařízení %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionální (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -311,8 +314,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info o uživateli"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobrazit informace o profilu na obrazovce uzamčení"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informace o profilu"</string>
-    <!-- no translation found for location_settings_title (1369675479310751735) -->
-    <skip />
+    <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
@@ -986,26 +988,20 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Připojte se prosím k internetu."</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
-    <!-- no translation found for location_mode_title (3982009713118421689) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_title (8241802585110932849) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
-    <skip />
-    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
-    <skip />
-    <!-- no translation found for location_category_location_services (7437150886946685979) -->
-    <skip />
-    <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
-    <skip />
+    <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká přesnost"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
+    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Pouze senzory zařízení"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Služby určování polohy"</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>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Poloha: GPS, Wi-Fi a mob. síť"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Poloha: Wi-Fi a mob. síť"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Urč. přes. polohy pomocí GPS"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Načítání…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilní sítě"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
@@ -1053,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zkuste to znovu:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nakreslete své bezpečnostní gesto:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na závěr zdvihněte prst z obrazovky."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimální počet spojených teček je <xliff:g id="NUMBER">%d</xliff:g>. Zkuste to znovu:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Gesto bylo zaznamenáno."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Proveďte gesto znovu pro potvrzení:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nové gesto odemknutí:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na závěr zdvihněte prst z obrazovky"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Minimální počet spojených teček je <xliff:g id="NUMBER">%d</xliff:g>. Zkuste to znovu."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Gesto bylo zaznamenáno"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Proveďte gesto znovu pro potvrzení"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Nové bezpečnostní gesto"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdit"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Nakreslit znovu"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Zkusit znovu"</string>
@@ -1127,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tímto resetujete všechna nastavení následujících položek:\n\n "<li>"zakázané aplikace,"</li>\n" "<li>"zakázaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace pro různé akce,"</li>\n" "<li>"omezení datových přenosů na pozadí pro aplikace,"</li>\n" "<li>"veškerá omezení oprávnění."</li>\n\n" Nepřijdete o žádná data aplikací."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnovit aplikace"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
@@ -1367,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení usnadnění"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Popisky"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesta pro přiblížení obrazovky"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Je-li tato funkce zapnutá, můžete zobrazení přibližovat a oddalovat tak, že třikrát klepnete na obrazovku.\n\nPři přiblížení můžete provádět tyto činnosti:\n"<ul><li>"Posunutí: táhněte po obrazovce minimálně dvěma prsty."</li>\n<li>"Změna úrovně přiblížení: alespoň dva prsty stáhněte k sobě, nebo roztáhněte od sebe."</li></ul>\n\n"Také je možné dočasně zvětšit oblast pod prstem. Stačí na ni třikrát klepnout a podržet ji. V takto zvětšeném náhledu můžete přetáhnutím prstu prohlížet libovolné části obrazovky. Do předchozího zobrazení se vrátíte zdvihnutím prstu.\n\nPoznámka: Zvětšení trojitým klepnutím funguje ve všech částech obrazovky s výjimkou klávesnice a navigační lišty."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka usnadnění"</string>
@@ -1383,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavení"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuto"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuto"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Náhled"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardní možnosti"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Jazyk"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Velikost textu"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Styl popisku"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Vlastní možnosti"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Barva pozadí"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprůhlednost pozadí"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Barva textu"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Barva okraje"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Typ okraje"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Rodina písem"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Popisek bude vypadat takto"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Výchozí"</string>
+    <string name="color_none" msgid="3475640044925814795">"Žádná"</string>
+    <string name="color_white" msgid="8045195170201590239">"Bílá"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Šedá"</string>
+    <string name="color_black" msgid="7517353520909872561">"Černá"</string>
+    <string name="color_red" msgid="4949354900304125428">"Červená"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zelená"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Modrá"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Tyrkysová"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Žlutá"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Sledovat vlastní akce"</string>
@@ -1480,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualizovat"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiky procesů"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Prapodivné statistiky běžících procesů"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Využití paměti"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1513,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vyberte jiný modul"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Modul pro syntézu řeči může shromažďovat veškerý mluvený text, včetně osobních dat jako jsou hesla nebo čísla kreditních karet. Je založen na modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete modul pro syntézu řeči aktivovat?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Pro tento jazyk je k převodu textu na hlasový výstup potřeba připojení k síti."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Toto je příklad syntézy řeči"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Stav výchozího jazyka"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> je plně podporován"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> vyžaduje připojení k síti"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> není podporován"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Probíhá kontrola..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavení modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Položka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivována"</string>
@@ -1549,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínání"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizace"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
@@ -1733,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynutit směr rozvrž. RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynutit ve všech jazycích směr rozvržení obr. RTL"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
@@ -1925,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Zaplatit dotykem telefonu"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy se dotázat"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastavit jako předvolbu?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
@@ -1947,8 +1974,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
-    <!-- no translation found for restriction_location_enable_title (5020268888245775164) -->
-    <skip />
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"Poloha"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Povolit aplikaci používat informace o vaší poloze"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Zpět"</string>
     <string name="wizard_next" msgid="3606212602795100640">"Další"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 11b11fb..a2db644 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Mellem"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Standard"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif, kondenseret"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Enkelt tegnafstand"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Meget lille"</item>
+    <item msgid="6781094565687692782">"Lille"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Stor"</item>
+    <item msgid="9044232017390975191">"Meget stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ingen"</item>
+    <item msgid="1352974708028506778">"Omrids"</item>
+    <item msgid="5850876295428722675">"Baggrundsskygge"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Sort på hvidt"</item>
+    <item msgid="1770533843436933500">"Hvidt på sort"</item>
+    <item msgid="1309255027325660115">"Gult på sort"</item>
+    <item msgid="2985943780939258562">"Gult på blåt"</item>
+    <item msgid="7520438652121629055">"Tilpasset"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Tillad aldrig"</item>
     <item msgid="1417929597727989746">"Tillad altid"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderat"</item>
+    <item msgid="406385694840950802">"lav"</item>
+    <item msgid="4212263919458209842">"kritisk"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index df28ceb..0a346cc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -34,8 +34,8 @@
     <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå radio til"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå radio fra"</string>
-    <string name="sms_over_ims_on" msgid="5085290395865632925">"Slå SMS via IMS til"</string>
-    <string name="sms_over_ims_off" msgid="8354792045992793959">"Slå SMS via IMS fra"</string>
+    <string name="sms_over_ims_on" msgid="5085290395865632925">"Slå sms via IMS til"</string>
+    <string name="sms_over_ims_off" msgid="8354792045992793959">"Slå sms via IMS fra"</string>
     <string name="ims_reg_required_on" msgid="3885152087309614653">"Det er nødvendigt at slå IMS-registrering til"</string>
     <string name="ims_reg_required_off" msgid="1720570343422743943">"Sluk IMS-registrering nødvendig"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"Tænd kassering af LTE RAM"</string>
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Anmodning om telefonbog"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s vil gerne have adgang til dine kontaktpersoner og opkaldsoversigt. Vil du give %2$s adgang?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Spørg ikke igen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Spørg ikke igen"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Beskedanmodning"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vil gerne have adgang til dine beskeder. Vil du give %2$s adgang?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Indstillinger for dato og tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høj nøjagtighed"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batteribesparelse"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Kun enhedens sensorer"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Placering fra"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Seneste placeringsanmodninger"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Placeringstjenester"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Beregn placering med GPS, Wi-Fi og mobilnetværk"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Beregn placering med Wi-Fi og mobilnetværk"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Find din placering med GPS"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Henter..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Placering af Wi-Fi- og mobilnet."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Placeringen fastlægges af Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Skift pinkode til at låse op"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv igen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Tegn et åbningsmønster:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip med fingeren, når du er færdig."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mønstret er registreret."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønstret igen for at bekræfte:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Dit nye oplåsningsmønster:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slip med fingeren, når du er færdig"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Mønstret blev registreret"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Tegn mønstret igen for at bekræfte"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Dit nye oplåsningsmønster"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekræft"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Tegn igen"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Prøv igen"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette vil nulstille alle præferencer for:\n\n "<li>"deaktiverede apps"</li>\n" "<li>"deaktiverede appunderretninger"</li>\n" "<li>"standardapplikationer til handlinger"</li>\n" "<li>"begrænsning af baggrundsdata for apps"</li>\n" "<li>"eventuelle begrænsede tilladelser"</li>\n\n" Du vil ikke miste nogen appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nulstil apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for tilgængelighed"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Undertekster"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Forstørrelsesbevægelser"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Når denne funktion er slået til, kan du zoome ind og ud ved at trykke tre gange på skærmen.\n\nMens der er zoomet ind, kan du:\n"<ul><li>"panorere: Træk to eller flere fingre hen over skærmen."</li>\n<li>"justere zoomniveauet: Knib to eller flere fingre sammen, eller spred dem fra hinanden."</li></ul>\n\n"Du kan også midlertidigt forstørre, hvad der er under din finger, ved at trykke tre gange og holde fingeren på skærmen. I denne forstørrede tilstand, kan du trække fingeren for at udforske forskellige dele af skærmen. Løft fingeren for at vende tilbage til din forrige tilstand.\n\nBemærk! Du kan forstørre ved at trykke tre gange overalt undtagen på tastaturet og i navigationslinjen."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Tilgængelighedsgenvej"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Til"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Fra"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Eksempelvisning"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standard muligheder"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Sprog"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tekststørrelse"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Undertekststil"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Tilpassede valgmuligheder"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Baggrundsfarve"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Baggrundens gennemsigtighed"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Tekstfarve"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Rammens farve"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Rammetype"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Skrifttypefamilie"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Underteksterne vil se sådan ud"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
+    <string name="color_white" msgid="8045195170201590239">"Hvid"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grå"</string>
+    <string name="color_black" msgid="7517353520909872561">"Sort"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rød"</string>
+    <string name="color_green" msgid="5537717328428845841">"Grøn"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blå"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Grønblå"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Lyslilla"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"observere dine handlinger"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Opdater"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medieserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistikker"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Nørdede statistikker om kørende processer"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vælg en anden maskine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne tale kan muligvis indsamle al den tekst, der udtales, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Aktivér brug af denne talesyntesemaskine?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Der kræves en aktiv netværksforbindelse, for at tekst-til-tale kan anvendes på dette sprog."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dette er et eksempel på talesyntese."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status for standardsprog"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> er fuldt understøttet"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> kræver netværksforbindelse"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> understøttes ikke"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerer..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Maskiner"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-indstillinger"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktiveret"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"deaktiverer"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Placering"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkroniser"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving læsning mod venstre"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving til højre mod venstre-layout for alle sprog"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skærmoverlejring viser det aktuelle CPU-forbrug"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving gengivelse af GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Peg og betal"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Spørg hver gang"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vil du angive dette som din præference?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index d4ee651..fbfde84 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Mittel"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Standard"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif, schmal"</item>
+    <item msgid="4406003087391086325">"Serife"</item>
+    <item msgid="1558362802170124073">"Festbreitenschrift"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Sehr klein"</item>
+    <item msgid="6781094565687692782">"Klein"</item>
+    <item msgid="8222123259497646551">"Mittel"</item>
+    <item msgid="5813217276778560466">"Groß"</item>
+    <item msgid="9044232017390975191">"Sehr groß"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ohne"</item>
+    <item msgid="1352974708028506778">"Kontur"</item>
+    <item msgid="5850876295428722675">"Schlagschatten"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Schwarz auf Weiß"</item>
+    <item msgid="1770533843436933500">"Weiß auf Schwarz"</item>
+    <item msgid="1309255027325660115">"Gelb auf Schwarz"</item>
+    <item msgid="2985943780939258562">"Gelb auf Blau"</item>
+    <item msgid="7520438652121629055">"Benutzerdefiniert"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nie zulassen"</item>
     <item msgid="1417929597727989746">"Immer zulassen"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"Normal"</item>
+    <item msgid="4517779899383204000">"Mittel"</item>
+    <item msgid="406385694840950802">"Niedrig"</item>
+    <item msgid="4212263919458209842">"Kritisch"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8838a98..51e215c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Möchten Sie eine Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" herstellen?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonbuchanfrage"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s möchte auf Ihre Kontakte und Ihre Anrufliste zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nicht mehr fragen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nicht mehr fragen"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Nachrichtenanfrage"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s möchte auf Ihre Nachrichten zugreifen. Möchten Sie %2$s den Zugriff erlauben?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Lokal (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -990,12 +993,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Stromsparfunktion"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Nur Gerätesensoren"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Standort aus"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Letzte Standortanfragen"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Standortdienste"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS/WLAN/Mobilfunknetz für ungefähren Standort nutzen"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"WLAN/Mobilfunknetz für ungefähren Standort nutzen"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS für Standort verwenden"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Daten werden abgerufen…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"WLAN- &amp; Mobilfunknetz-Standort"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
@@ -1043,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Erneut versuchen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Zeichnen Sie ein Entsperrungsmuster:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichnen Sie ein Entsperrungsmuster."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbinden Sie mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Versuchen Sie es erneut:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Muster wurde aufgezeichnet."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Zeichnen Sie das Muster zur Bestätigung erneut:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ihr neues Entsperrungsmuster:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbinden Sie mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Bitte versuchen Sie es erneut."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Muster wurde aufgezeichnet."</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Zeichnen Sie das Muster zur Bestätigung erneut."</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ihr neues Entsperrungsmuster"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bestätigen"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Neu aufzeichnen"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Wiederholen"</string>
@@ -1117,8 +1124,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>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <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_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1357,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Bedienungshilfen"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Untertitel"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrößerungsbewegungen"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wenn diese Funktion aktiviert ist, können Sie heranzoomen und herauszoomen, indem Sie drei Mal auf den Bildschirm tippen.\n\nWenn Sie herangezoomt haben, können Sie:\n"<ul><li>"Schwenken: mindestens 2 Finger über den Bildschirm ziehen"</li>\n<li>"Zoomstufe anpassen: mindestens 2 Finger zusammen- oder auseinanderziehen"</li></ul>\n\n"Sie können auch das, was sich unter Ihrem Finger befindet, vorübergehend vergrößern, indem Sie drei Mal tippen und halten. In diesem vergrößerten Zustand können Sie Ihren Finger ziehen, um verschiedene Bereiche des Bildschirms zu erkunden. Heben Sie Ihren Finger an, um zum vorherigen Zustand zurückzukehren.\n\nHinweis: Das dreimalige Tippen zur Vergrößerung funktioniert überall außer in der Tastatur und in der Navigationsleiste."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
@@ -1373,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Einstellungen"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"An"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Aus"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Vorschau"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardoptionen"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Sprache"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Textgröße"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Untertitelstil"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Benutzerdefinierte Optionen"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Hintergrundfarbe"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Hintergrundtransparenz"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Schriftfarbe"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Rahmenfarbe"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Rahmentyp"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Schriftart"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Untertitel sehen so aus."</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_none" msgid="3475640044925814795">"Keine"</string>
+    <string name="color_white" msgid="8045195170201590239">"Weiß"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grau"</string>
+    <string name="color_black" msgid="7517353520909872561">"Schwarz"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rot"</string>
+    <string name="color_green" msgid="5537717328428845841">"Grün"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blau"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Blaugrün"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Gelb"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> benötigt:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Ihre Aktionen beobachten"</string>
@@ -1470,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualisieren"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Prozessstatistiken"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Interessante Statistiken zu laufenden Prozessen"</string>
+    <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 Speicherstand des Geräts ist momentan <xliff:g id="MEMSTATE">%1$s</xliff:g>."</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>
@@ -1503,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Anderes Modul auswählen"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Dieses Sprachsynthesemodul kann den gesamten gesprochenen Text erfassen, einschließlich personenbezogener Daten wie Passwörter und Kreditkartennummern. Es ist Teil der App \"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>\". Möchten Sie dieses Sprachsynthesemodul aktivieren?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Für diese Sprache ist zur Text-in-Sprache-Ausgabe eine aktive Netzwerkverbindung erforderlich."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dies ist ein Beispiel für Sprachsynthese."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status der Standardsprache"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> wird vollständig unterstützt."</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> erfordert eine Netzwerkverbindung."</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> wird nicht unterstützt."</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Wird geprüft..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Module"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-Einstellungen"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist aktiviert."</string>
@@ -1539,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Wird deaktiviert..."</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Standort"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisierung"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Helligkeit <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
@@ -1723,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Layoutgrenzen einblenden"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL-Layout erzwingen"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"RTL-Bildschirmlayout für alle Sprachen erzwingen"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-Auslastung anzeigen"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Bildschirm-Overlay mit aktueller CPU-Auslastung"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-Rendering erzwingen"</string>
@@ -1915,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Mobil bezahlen"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Jedes Mal fragen"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Als bevorzugte Einstellung festlegen?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Einschränkungen"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Einschränkungen aufheben"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ändern"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 3bc7b17..fa5d382 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Μεσαία"</item>
     <item msgid="2372711992605524591">"Παρατεταμένο"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Προεπιλογή"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Πολύ μικρό"</item>
+    <item msgid="6781094565687692782">"Μικρό"</item>
+    <item msgid="8222123259497646551">"Κανονικό"</item>
+    <item msgid="5813217276778560466">"Μεγάλο"</item>
+    <item msgid="9044232017390975191">"Πολύ μεγάλο"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Κανένα"</item>
+    <item msgid="1352974708028506778">"Περίγραμμα"</item>
+    <item msgid="5850876295428722675">"Αναπτυσσόμενη σκιά"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Μαύρο σε λευκό"</item>
+    <item msgid="1770533843436933500">"Λευκό σε μαύρο"</item>
+    <item msgid="1309255027325660115">"Κίτρινο σε μαύρο"</item>
+    <item msgid="2985943780939258562">"Κίτρινο σε μπλε"</item>
+    <item msgid="7520438652121629055">"Προσαρμοσμένο"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Να μην επιτρέπεται ποτέ"</item>
     <item msgid="1417929597727989746">"Να επιτρέπεται πάντα"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"κανονική"</item>
+    <item msgid="4517779899383204000">"μέτρια"</item>
+    <item msgid="406385694840950802">"χαμηλή"</item>
+    <item msgid="4212263919458209842">"κρίσιμη"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index aacd9fb..5d1f811 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Θέλετε να συνδεθείτε στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\";"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Αίτημα τηλεφωνικού καταλόγου"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Το %1$s ζητά πρόσβαση στις επαφές και στο ιστορικό κλήσεών σας. Να εκχωρηθεί πρόσβαση στο %2$s;"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Να μην ερωτηθώ ξανά"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Να μην ερωτηθώ ξανά"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Αίτημα μηνύματος"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s επιθυμεί να αποκτήσει πρόσβαση στα μηνύματά σας. Παραχώρηση πρόσβασης σε %2$s;"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Τοπική (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Υψηλή ακρίβεια"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Εξοικονόμησης μπαταρίας"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Μόνο αισθητήρες συσκευής"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Τοποθεσία απενεργοποιημένη"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Υπηρεσίες τοποθεσίας"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Χρήση GPS, Wi‑Fi και δικτ.κιν.τηλ. για υπολ.τοποθ."</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Χρήση Wi‑Fi και δικτύων κιν.τηλ. για υπολ.τοποθ."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Χρήση GPS για εντοπισμό τοποθεσίας"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Χρήση GPS για τοποθεσία"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Ανάκτηση…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Τοποθεσία Wi‑Fi και δικτύων κιν. τηλεφ."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Αλλαγή αριθμού PIN ξεκλειδώματος"</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="2063630508212535241">"Σχεδίαση μοτίβου ξεκλειδώματος:"</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="4622772178078818425">"Αφήστε το δάκτυλο μετά την ολοκλήρωση."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Συνδέστε τουλάχιστον <xliff:g id="NUMBER">%d</xliff:g> σημεία. Προσπαθήστε ξανά:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Το μοτίβο καταγράφηκε."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Σχεδιάστε ξανά το μοτίβο για επιβεβαίωση:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Το νέο μοτίβο ξεκλειδώματος:"</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_confirm_button_text" msgid="1128204343957002841">"Επιβεβαίωση"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Ανασχεδιασμός"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Προσπάθεια ξανά"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n" "<li>"Τυχόν περιορισμούς αδειών"</li>\n\n" Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Επαναφορά εφαρμογών"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ρυθμίσεις προσβασιμότητας"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Υπηρεσίες"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Σύστημα"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Υπότιτλοι"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Κινήσεις μεγέθυνσης"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Όταν είναι ενεργοποιημένη αυτή η λειτουργία, μπορείτε να κάνετε μεγέθυνση και σμίκρυνση πατώντας τρεις φορές την οθόνη.\n\nΚατά τη μεγέθυνση, μπορείτε να κάνετε:\n"<ul><li>"Πανοραμική λήψη: σύρετε δύο ή περισσότερα δάχτυλα κατά μήκος της οθόνης."</li>\n<li>"Προσαρμογή του επιπέδου μεγέθυνσης: πλησιάστε δύο ή περισσότερα δάχτυλα ή απομακρύνετέ τα."</li></ul>\n\n"Μπορείτε επίσης να μεγεθύνετε προσωρινά το περιεχόμενο που βρίσκεται κάτω από το δάχτυλό σας πατώντας τρεις φορές και κρατώντας παρατεταμένα. Κατά τη μεγέθυνση, μπορείτε να σύρετε το δάχτυλό σας για να εξερευνήσετε διάφορα τμήματα της οθόνης. Σηκώστε το δάχτυλό σας για να επιστρέψετε στην προηγούμενη κατάσταση.\n\nΣημείωση: το πάτημα τρεις φορές για μεγέθυνση λειτουργεί παντού εκτός από το πληκτρολόγιο και τη γραμμή πλοήγησης."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Συντόμευση προσβασιμότητας"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ρυθμίσεις"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ενεργή"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ανενεργή"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Προεπισκόπηση"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Βασικές επιλογές"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Γλώσσα"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Μέγεθος κειμένου"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Στυλ υποτίτλων"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Προσαρμοσμένες επιλογές"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Χρώμα φόντου"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Αδιαφάνεια φόντου"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Χρώμα γραμματοσειράς"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Χρώμα άκρων"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Τύπος άκρων"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Οικογένεια γραμματοσειρών"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Οι υπότιτλοι θα φαίνονται έτσι"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Αα"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Προεπιλογή"</string>
+    <string name="color_none" msgid="3475640044925814795">"Κανένα"</string>
+    <string name="color_white" msgid="8045195170201590239">"Λευκό"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Γκρι"</string>
+    <string name="color_black" msgid="7517353520909872561">"Μαύρο"</string>
+    <string name="color_red" msgid="4949354900304125428">"Κόκκινο"</string>
+    <string name="color_green" msgid="5537717328428845841">"Πράσινο"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Μπλε"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Κυανό"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Κίτρινο"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Πορφυρό"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> έχει τις εξής δυνατότητες:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Παρατήρηση των ενεργειών σας"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Ανανέωση"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Λειτουργικό σύστημα Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Στατιστικά στοιχεία διαδικασίας"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Χρήσιμα στατιστικά στοιχεία σχετικά με τις εκτελούμενες διαδικασίες"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Χρήση μνήμης"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Επιλέξτε μια άλλη μηχανή"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Αυτή η μηχανή σύνθεσης ομιλίας μπορεί να συγκεντρώσει όλο το κείμενο που θα εκφωνηθεί, συμπεριλαμβανομένων προσωπικών δεδομένων όπως οι κωδικοί πρόσβασης και οι αριθμοί πιστωτικών καρτών. Προέρχεται από τη μηχανή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Να ενεργοποιηθεί η μηχανή σύνθεσης ομιλίας;"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Αυτή η γλώσσα απαιτεί μια ενεργή σύνδεση δικτύου για τη μετατροπή κειμένου σε ομιλία."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Αυτό είναι ένα παράδειγμα σύνθεσης λόγου"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Κατάσταση προεπιλεγμένης γλώσσας"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Τα <xliff:g id="LOCALE">%1$s</xliff:g> υποστηρίζονται πλήρως"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Τα <xliff:g id="LOCALE">%1$s</xliff:g> απαιτούν σύνδεση δικτύου"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Δεν υποστηρίζονται τα <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Γίνεται έλεγχος"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Μηχανές"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ρυθμίσεις <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι ενεργοποιημένη"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"απενεργοποίηση"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Τοποθεσία"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Συγχρονισμός"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Φωτεινότητα <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"αυτόματη"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ενεργοποίηση ιχνών OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Εμφάνιση ορίων διάταξης"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Εμφάνιση ορίων κλιπ, περιθωρίων, κλπ."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Επιβολή κατ. διάταξης RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Επιβολή διάταξης οθόν. RTL για όλες τις τοπ. ρυθμ."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Πατήστε και πληρώστε"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Ερώτηση κάθε φορά"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ορισμός ως προτίμησης;"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Περιορισμοί"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Κατάργηση περιορισμών"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Αλλαγή κωδικού PIN"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index e1f18f9..c433a7e 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Default"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Very small"</item>
+    <item msgid="6781094565687692782">"Small"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Large"</item>
+    <item msgid="9044232017390975191">"Very large"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"None"</item>
+    <item msgid="1352974708028506778">"Outline"</item>
+    <item msgid="5850876295428722675">"Drop shadow"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Black on white"</item>
+    <item msgid="1770533843436933500">"White on black"</item>
+    <item msgid="1309255027325660115">"Yellow on black"</item>
+    <item msgid="2985943780939258562">"Yellow on blue"</item>
+    <item msgid="7520438652121629055">"Custom"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Never allow"</item>
     <item msgid="1417929597727989746">"Always allow"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderate"</item>
+    <item msgid="406385694840950802">"low"</item>
+    <item msgid="4212263919458209842">"critical"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 55d2d14..a8150c2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Phone book request"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wants to access your contacts and call history. Give access to %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Don\'t ask again"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Don\'t ask again"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Message request"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wants to access your messages. Give access to %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Date &amp; time settings"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Device sensors only"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Use GPS, Wi‑Fi and mobile networks to estimate location"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Use Wi‑Fi and mobile networks to estimate location"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Use GPS to pinpoint your location"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Retrieving…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Draw an unlock pattern:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Release finger when done."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connect at least <xliff:g id="NUMBER">%d</xliff:g> dots. Try again:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Pattern recorded."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Draw pattern again to confirm:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Your new unlock pattern:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Release finger when done"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Connect at least <xliff:g id="NUMBER">%d</xliff:g> dots. Try again."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Pattern recorded"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Draw pattern again to confirm"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Your new unlock pattern"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirm"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Redraw"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Retry"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n" "<li>"Any permission restrictions"</li>\n\n" You will not lose any app data."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Captions"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Magnification gestures"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n"<ul><li>"Pan: Drag two or more fingers across the screen."</li>\n<li>"Adjust zoom level: Pinch two or more fingers together or spread them apart."</li></ul>\n\n"You can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Settings"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Off"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Preview"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standard options"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Language"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Text size"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Caption style"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Customisation options"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Background colour"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Background opacity"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Text colour"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Edge colour"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Edge type"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Font family"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Captions will look like this"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_none" msgid="3475640044925814795">"None"</string>
+    <string name="color_white" msgid="8045195170201590239">"White"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grey"</string>
+    <string name="color_black" msgid="7517353520909872561">"Black"</string>
+    <string name="color_red" msgid="4949354900304125428">"Red"</string>
+    <string name="color_green" msgid="5537717328428845841">"Green"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blue"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Yellow"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observe your actions"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Process Stats"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Geeky stats about running processes"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Memory use"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"This is an example of speech synthesis"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Default language status"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> is fully supported"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requires network connection"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> is not supported"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Checking..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tap and Pay"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Ask every time"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Set as your preference?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions:"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 36ae151..02cb9a3 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predeterminado"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif condensada"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monoespacio"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Muy pequeña"</item>
+    <item msgid="6781094565687692782">"Pequeña"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Grande"</item>
+    <item msgid="9044232017390975191">"Muy grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ninguno"</item>
+    <item msgid="1352974708028506778">"Contorno"</item>
+    <item msgid="5850876295428722675">"Sombra paralela"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Negro sobre blanco"</item>
+    <item msgid="1770533843436933500">"Blanco sobre negro"</item>
+    <item msgid="1309255027325660115">"Amarillo sobre negro"</item>
+    <item msgid="2985943780939258562">"Amarillo sobre azul"</item>
+    <item msgid="7520438652121629055">"Personalizado"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"No permitir nunca"</item>
     <item msgid="1417929597727989746">"Permitir siempre"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderado"</item>
+    <item msgid="406385694840950802">"bajo"</item>
+    <item msgid="4212263919458209842">"crítico"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7dc7d8b..c83018f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Deseas conectarte a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desea acceder a tus contactos y a tu historial de llamadas. ¿Deseas darle acceso a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No volver a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitud de mensaje"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -924,7 +927,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, deber borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Eliminar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Eliminar la tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
@@ -986,15 +989,20 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet."</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precisión alta"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensores del dispositivo"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Servicios de ubicació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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Ubicar con GPS/Wi-Fi/red móvil"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Ubicar con Wi‑Fi y red móvil"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ubicar con GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Extraer un patrón de desbloqueo:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuja un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conecta al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Se grabó el patrón."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dibuja el patrón nuevamente para confirmar:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Tu nuevo patrón de desbloqueo:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Patrón grabado"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Vuelve a trazar el patrón para confirmar."</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Patrón de desbloqueo nuevo"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Revisar"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Intentar nuevamente"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablec. preferencias?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"aplicaciones inhabilitadas;"</li>\n" "<li>"notificaciones de aplicaciones inhabilitadas;"</li>\n" "<li>"aplicaciones predeterminadas para realizar acciones;"</li>\n" "<li>"restricciones de datos en segundo plano para aplicaciones;"</li>\n" "<li>"restricciones de permisos."</li>\n\n" Los datos de las aplicaciones no se perderán."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliación"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla presionada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: Puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Vista previa"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opciones estándar"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tamaño del texto"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Estilo de subtítulos"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opciones personalizadas"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Color de fondo"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacidad del fondo"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Color del texto"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Color del borde"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipo de borde"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Familia de fuentes"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Los subtítulos quedarán así:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ninguno"</string>
+    <string name="color_white" msgid="8045195170201590239">"Blanco"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gris"</string>
+    <string name="color_black" msgid="7517353520909872561">"Negro"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rojo"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Azul"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Amarillo"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar tus acciones"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de medios"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas para geeks sobre procesos activos"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Elegir otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz pueda recopilar todo el texto que se hablará, incluidos los datos personales como las contraseñas y los números de tarjetas de crédito. Proviene del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Deseas activar el uso de este motor de síntesis de voz?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma necesita una conexión de red en funcionamiento para la salida de texto a voz."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ejemplo de síntesis de voz"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Estado del idioma predeterminado"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> es totalmente compatible."</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> requiere una conexión de red."</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> no es compatible."</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Comprobando…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuración de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está habilitado."</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Ubicación"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de recortes, márgenes, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar diseño der. a izq."</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar diseño pantalla der.&gt;izq., cualquier idioma"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mostrar superposición en pantalla con uso actual de la CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar y pagar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 436c741..eeb85ad 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predeterminado"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Muy pequeña"</item>
+    <item msgid="6781094565687692782">"Pequeña"</item>
+    <item msgid="8222123259497646551">"Mediana"</item>
+    <item msgid="5813217276778560466">"Grande"</item>
+    <item msgid="9044232017390975191">"Muy grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ninguno"</item>
+    <item msgid="1352974708028506778">"Contorno"</item>
+    <item msgid="5850876295428722675">"Sombra paralela"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Negro sobre blanco"</item>
+    <item msgid="1770533843436933500">"Blanco sobre negro"</item>
+    <item msgid="1309255027325660115">"Amarillo sobre negro"</item>
+    <item msgid="2985943780939258562">"Amarillo sobre azul"</item>
+    <item msgid="7520438652121629055">"Personalizado"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"No permitir nunca"</item>
     <item msgid="1417929597727989746">"Permitir siempre"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderado"</item>
+    <item msgid="406385694840950802">"bajo"</item>
+    <item msgid="4212263919458209842">"crítico"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 176e438..43eeb77 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Quieres conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitud de agenda telefónica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s quiere acceder a tus contactos y a tu historial de llamadas. ¿Quieres permitir el acceso a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"No volver a preguntar"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"No volver a preguntar"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitud de mensaje"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s quiere acceder a tus mensajes. ¿Quieres permitir el acceso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ajustes de fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensores del dispositivo"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Calcular ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Calcular ubicación con Wi‑Fi y redes móviles"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Determinar ubicación con GPS"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recuperando…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicación por red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Crear un patrón de desbloqueo:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patrón de desbloqueo"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pulsa la tecla de menú para obtener ayuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patrón grabado"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vuelve a dibujar el patrón para confirmarlo"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Tu nuevo patrón de desbloqueo"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levanta el dedo cuando termines"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Patrón grabado"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Vuelve a dibujar el patrón para confirmarlo"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Tu nuevo patrón de desbloqueo"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Crear un patrón nuevo"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Repetir"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"aplicaciones inhabilitadas,"</li>\n" "<li>"notificaciones de aplicaciones inhabilitadas,"</li>\n" "<li>"aplicaciones predeterminadas para realizar acciones,"</li>\n" "<li>"restricciones de conexiones automáticas de aplicaciones,"</li>\n" "<li>"restricciones de permisos."</li>\n\n" No se perderán los datos de las aplicaciones."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ajustes de accesibilidad"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliación"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla pulsada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a accesibilidad"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Vista previa"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opciones estándar"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tamaño de la letra"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Estilo de subtítulos"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opciones personalizadas"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Color de fondo"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacidad del fondo"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Color del texto"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Color del borde"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipo de borde"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Tipo de fuente"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Así aparecerán los subtítulos"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ninguno"</string>
+    <string name="color_white" msgid="8045195170201590239">"Blanco"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gris"</string>
+    <string name="color_black" msgid="7517353520909872561">"Negro"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rojo"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Azul"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cian"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Amarillo"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar tus acciones"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Seleccionar otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz recopile todo el texto hablado, incluidos datos personales, como contraseñas y números de tarjeta de crédito. Procede del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este motor de síntesis de voz?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requiere una conexión de red activa para la salida de síntesis de voz."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este es un ejemplo de síntesis de voz"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Estado de idioma predeterminado"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"El <xliff:g id="LOCALE">%1$s</xliff:g> se admite completamente"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"El idioma <xliff:g id="LOCALE">%1$s</xliff:g> requiere conexión a Internet"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"No se admite el <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Comprobando..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ajustes de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Se ha habilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Ubicación"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar dirección diseño RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar dirección (RTL) para todas configuraciones"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suporponer el uso de la CPU en la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar aceleración GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar y pagar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Preguntar siempre"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"¿Establecer como preferencia?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index c6044b7..17ce8f4 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Keskmine"</item>
     <item msgid="2372711992605524591">"Pikk"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Vaikimisi"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif, tihendatud"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Püsisammkiri"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Väga väike"</item>
+    <item msgid="6781094565687692782">"Väike"</item>
+    <item msgid="8222123259497646551">"Tavaline"</item>
+    <item msgid="5813217276778560466">"Suur"</item>
+    <item msgid="9044232017390975191">"Väga suur"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Puudub"</item>
+    <item msgid="1352974708028506778">"Piirjoon"</item>
+    <item msgid="5850876295428722675">"Langev vari"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Must valgel"</item>
+    <item msgid="1770533843436933500">"Valge mustal"</item>
+    <item msgid="1309255027325660115">"Kollane mustal"</item>
+    <item msgid="2985943780939258562">"Kollane sinisel"</item>
+    <item msgid="7520438652121629055">"Kohandatud"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Ära luba kunagi"</item>
     <item msgid="1417929597727989746">"Luba alati"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"tavaline"</item>
+    <item msgid="4517779899383204000">"mõõdukas"</item>
+    <item msgid="406385694840950802">"madal"</item>
+    <item msgid="4212263919458209842">"kriitiline"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index d5f6dcf..3b04635 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Kas soovite ühendada seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoniraamatu taotlus"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s soovib juurdepääsu teie kontaktisikutele ja kõneajaloole. Kas lubate juurdepääsu kasutajale %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ära enam küsi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ära enam küsi"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Sõnumi taotlus"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s soovib saada juurdepääsu sõnumitele. Kas anda seadmele %2$s juurdepääs?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Kuupäeva ja kellaaja seaded"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Piirkondlik (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Väga täpne"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aku säästmine"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Ainult seadme andurid"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Asukohateenused"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Asukoha määramine GPS-i, WiFi ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Asukoha määramine WiFi ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Asukoha määramine GPS-iga"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"WiFi järgi määratud asukoht"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuda avamise PIN-koodi"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kinnitage salvestatud muster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Proovige uuesti:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Joonistage avamismuster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Joonistage avamismuster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Abi saamiseks vajutage valikut Menüü."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Tõsta sõrm, kui on valmis."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ühendage vähemalt <xliff:g id="NUMBER">%d</xliff:g> punkti. Proovige uuesti:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Muster on salvestatud."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Koosta muster kinnitamiseks uuesti:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Teie uus avamismuster:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Kui olete valmis, siis tõstke sõrm"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Ühendage vähemalt <xliff:g id="NUMBER">%d</xliff:g> punkti. Proovige uuesti."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Muster on salvestatud"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Joonistage muster kinnitamiseks uuesti"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Teie uus avamismuster"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Kinnita"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Koosta uuesti"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Proovige uuesti"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduse märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n" Rakenduse andmed säilivad."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Juurdepääsetavuse seaded"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Teenused"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Tiitrid"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurendamisliigutused"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kui see funktsioon on sisse lülitatud, saate suurendada ja vähendada, kolmikpuudutades ekraani.\n\nSuurendatult saab teha järgmist.\n"<ul><li>"Paanida: lohistage kahe või enama sõrmega üle ekraani."</li>\n<li>"Korrigeerida suumitaset: liigutage kahte või enamat sõrme kokku või lahku."</li></ul>\n\n"Saate ka ajutiselt suurendada sõrme all olevat kujutist, kolmikpuudutades ekraani ja hoides sõrme ekraanil. Selles suurendatud olekus saate sõrme ekraanil lohistada, et vaadata kuva erinevaid osi. Eelmisesse olekusse naasmiseks tõstke sõrm ekraanilt.\n\nMärkus: kolmikpuudutamine suurendamiseks toimib kõikjal, v.a klaviatuur ja navigeerimisriba."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hõlbustuse otsetee"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Seaded"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Sees"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Väljas"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Eelvaade"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardvalikud"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Keel"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Teksti suurus"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Tiitri stiil"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Kohandatud valikud"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Tausta värv"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Tausta läbipaistvus"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Teksti värv"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Serva värv"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Serva tüüp"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Fondi perekond"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Tiitrid näevad välja sellised"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Vaikimisi"</string>
+    <string name="color_none" msgid="3475640044925814795">"Puudub"</string>
+    <string name="color_white" msgid="8045195170201590239">"Valge"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Hall"</string>
+    <string name="color_black" msgid="7517353520909872561">"Must"</string>
+    <string name="color_red" msgid="4949354900304125428">"Punane"</string>
+    <string name="color_green" msgid="5537717328428845841">"Roheline"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Sinine"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Tsüaan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Kollane"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Fuksia"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> peab:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Toimingute jälgimine"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Värskenda"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Meediumiserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Protsessi statistika"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Tehnilised üksikasjad protsesside käitamise kohta"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Mälu kasutamine"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vali teine ​​mootor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"See kõnesünteesimootor võib koguda kogu kõneldud teksti, sh isiklikke andmeid, nagu paroolid ja krediitkaardinumbrid. Selle aluseks on mootor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Kas lubada kõnesünteesimootori kasutamine?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Selle keele puhul on kõnesünteesi väljundi jaoks vaja toimivat võrguühendust."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"See on kõnesünteesi näide"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Vaikekeele olek"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> on täielikult toetatud"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> vajab võrguühendust"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> pole toetatud"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Laadimine ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mootorid"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Mootori <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> seaded"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on lubatud"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"väljalülitamine"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Asukoht"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sünkroonimine"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Heledus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaatne"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paremalt vasakule paig."</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Määra lokaatides ekraanipaig. paremalt vasakule"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Praegust CPU-kasutust kuvav ekraani ülekate"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Jõusta GPU renderdamine"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Puuduta ja maksa"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Küsi iga kord"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Kas määrata eelistuseks?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Piirangud"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eemalda piirangud"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Muuda PIN-koodi"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 737e56c..8c56bfa 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"متوسط"</item>
     <item msgid="2372711992605524591">"طولانی"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"پیش‌فرض"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif فشرده"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"هم‌عرض"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"بسیار کوچک"</item>
+    <item msgid="6781094565687692782">"کوچک"</item>
+    <item msgid="8222123259497646551">"عادی"</item>
+    <item msgid="5813217276778560466">"بزرگ"</item>
+    <item msgid="9044232017390975191">"بسیار بزرگ"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"هیچ‌کدام"</item>
+    <item msgid="1352974708028506778">"نمای کلی"</item>
+    <item msgid="5850876295428722675">"سایه‌دار"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"٪۲۵"</item>
+    <item msgid="2367156416247936773">"٪۵۰"</item>
+    <item msgid="5395560410107149298">"٪۷۵"</item>
+    <item msgid="8342334626783983353">"٪۱۰۰"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"سیاه در سفید"</item>
+    <item msgid="1770533843436933500">"سفید در سیاه"</item>
+    <item msgid="1309255027325660115">"زرد در سیاه"</item>
+    <item msgid="2985943780939258562">"زرد در آبی"</item>
+    <item msgid="7520438652121629055">"سفارشی"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"همیشه غیرمجاز"</item>
     <item msgid="1417929597727989746">"همیشه مجاز"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"معمولی"</item>
+    <item msgid="4517779899383204000">"متوسط"</item>
+    <item msgid="406385694840950802">"کم"</item>
+    <item msgid="4212263919458209842">"بحرانی"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e9e15a9..557ef49 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"آیا می‌خواهید به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وصل شوید؟"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"درخواست دفترچه تلفن"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s می‌خواهد به مخاطبین و سابقه تماس شما دسترسی پیدا کند. اجازهٔ دسترسی به %2$s داده شود؟"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"دوباره سؤال نشود"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"دوباره سؤال نشود"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"درخواست پیام"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s می‌خواهد به پیام‌های شما دسترسی یابد. اجازه دسترسی به %2$s داده شود؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"تنظیمات تاریخ و ساعت"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"پیش‌فرض (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقت زیاد"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"صرفه‌جویی در باتری"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"فقط حسگرهای دستگاه"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"موقعیت مکانی خاموش"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"درخواست‌های اخیر موقعیت مکانی"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"خدمات موقعیت مکانی"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"استفاده از GPS،‏ Wi-Fi و شبکه همراه برای تخمین مکان"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"استفاده از Wi-Fi و شبکه همراه برای تخمین مکان"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"استفاده از GPS برای تعیین دقیق مکان‌ شما"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <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_wrong" msgid="4694973540770105678">"دوباره امتحان کنید:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"الگوی بازگشایی قفل را ترسیم کنید:"</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="4622772178078818425">"پس از انجام کار، انگشت را رها کنید."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را متصل کنید. دوباره امتحان کنید:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"الگو ضبط شد."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"مجدداً الگو را برای تأیید بکشید:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"الگوی بازگشایی قفل جدید شما:"</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_confirm_button_text" msgid="1128204343957002841">"تأیید"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"کشیدن مجدد"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"امتحان مجدد"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"فرآیندهای ذخیره شده در حافظهٔ پنهان"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی تنظیمات برگزیده برنامه"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"تنظیمات برگزیده برنامه بازنشانی شوند؟"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"با این کار تمام تنظیمات برگزیده برای این موارد بازنشانی می‌شود:\n\n "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملکردها"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n" "<li>"هرگونه محدودیت‌های مجوز"</li>\n\n" هیچ داده برنامه‌ای را از دست نخواهید داد."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"بازنشانی برنامه‌ها"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"تنظیمات قابلیت دسترسی"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"سرویس‌ها"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"سیستم"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"زیرنویس‌ها"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"حرکات بزرگنمایی"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"وقتی این ویژگی فعال است، شما می‌توانید با سه ضربه روی صفحه بزرگنمایی یا کوچکنمایی کنید.\n\nهنگام بزرگنمایی می‌توانید:\n"<ul><li>"حرکت کنید: دو یا چند انگشت خود را روی صفحه بکشید."</li>\n<li>"تنظیم سطح بزرگنمایی: دو یا چند انگشت خود را به هم نزدیک کنید یا از هم دور کنید."</li></ul>\n\n"همچنین می‌توانید به صورت موقت آنچه را که در زیر انگشتان شما قرار دارد با سه بار ضربه روی صفحه و نگهداشتن آن بزرگ کنید. در این حالت بزرگنمایی شده، می‌توانید انگشت خود را برای کاوش قسمت‌های مختلف صفحه بکشید. برای بازگشت به حالت قبلی خود، انگشت خود را بردارید.\n\nتوجه: سه بار ضربه برای بزرگنمایی همه جا به غیر از صفحه کلید و نوار پیمایش کار می‌کند."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"میانبرهای قابلیت دسترسی"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"تنظیمات"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"فعال"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"غیرفعال"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"پیش‌نمایش"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"گزینه‌های استاندارد"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"زبان"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"اندازه نوشتار"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"سبک زیرنویس"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"گزینه‌های سفارشی"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"رنگ پس‌زمینه"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"ماتی پس‌زمینه"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"رنگ نوشتار"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"رنگ لبه"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"نوع لبه"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"گروه قلم"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"زیرنویس‌ها شبیه به این هستند"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"پیش‌فرض"</string>
+    <string name="color_none" msgid="3475640044925814795">"هیچ‌کدام"</string>
+    <string name="color_white" msgid="8045195170201590239">"سفید"</string>
+    <string name="color_gray" msgid="9192312087142726313">"خاکستری"</string>
+    <string name="color_black" msgid="7517353520909872561">"سياه"</string>
+    <string name="color_red" msgid="4949354900304125428">"قرمز"</string>
+    <string name="color_green" msgid="5537717328428845841">"سبز"</string>
+    <string name="color_blue" msgid="7731984529016953223">"آبی"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"سبز آبی"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"زرد"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"زرشکی"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"عملکردهای خود را مشاهده کنید"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"تازه کردن"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"سیستم عامل Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"سرور رسانه"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"آمار فرآیند"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"آمار دقیق برای فرآیندهای در حال اجرا"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"استفاده از حافظه"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"انتخاب یک موتور دیگر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"این موتور ترکیب صوتی ممکن است بتواند تمام متن گفته شده را جمع‌آوری کند، از جمله اطلاعات شخصی مانند رمزهای ورود و شماره‌های کارت اعتباری. این کارها توسط موتور<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> انجام می‌شود. استفاده از این موتور ترکیب صوتی را فعال می‌کنید؟"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"این زبان به یک اتصال شبکه فعال برای خروجی نوشتار به گفتار نیاز دارد."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"این نمونه‌ای از ترکیب گفتار است"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"وضعیت زبان پیش‌فرض"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> کاملاً پشتیبانی می‌شود"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> به اتصال شبکه نیاز دارد"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> پشتیبانی نمی‌شود"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"در حال بررسی..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"موتورها"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> تنظیمات"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> فعال است"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"در حال خاموش کردن"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"مکان"</string>
     <string name="gadget_sync" msgid="858895763714222152">"همگام‌سازی"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"روشنایی <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"خودکار"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"فعال کردن ردیابی‌های OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"نمایش مرزها، حاشیه‌ها و ویژگی‌های دیگر کلیپ."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"اجباری کردن جهت چیدمانRTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"اجباری کردن جهت چیدمان RTL صفحه برای همه زبان‌ها"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحهٔ نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"پرداخت با یک ضربه"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"هر بار پرسیده شود"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"به عنوان روش ترجیحی شما تنظیم شود؟"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"محدودیت‌ها"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"حذف محدودیت‌ها"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغییر پین"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index e91a8ea..9c0469b 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Keskipitkä"</item>
     <item msgid="2372711992605524591">"Pitkä"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Oletus"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif, tiivistetty"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Hyvin pieni"</item>
+    <item msgid="6781094565687692782">"Pieni"</item>
+    <item msgid="8222123259497646551">"Normaali"</item>
+    <item msgid="5813217276778560466">"Suuri"</item>
+    <item msgid="9044232017390975191">"Hyvin suuri"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ei mitään"</item>
+    <item msgid="1352974708028506778">"Ääriviiva"</item>
+    <item msgid="5850876295428722675">"Varjostus"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Musta valkoisella"</item>
+    <item msgid="1770533843436933500">"Valkoinen mustalla"</item>
+    <item msgid="1309255027325660115">"Keltainen mustalla"</item>
+    <item msgid="2985943780939258562">"Keltainen sinisellä"</item>
+    <item msgid="7520438652121629055">"Muokattu"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Älä salli koskaan"</item>
     <item msgid="1417929597727989746">"Salli aina"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normaali"</item>
+    <item msgid="4517779899383204000">"keskitaso"</item>
+    <item msgid="406385694840950802">"matala"</item>
+    <item msgid="4212263919458209842">"kriittinen"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e76b77f..55064ce 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Haluatko yhdistää laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Osoitekirjapyyntö"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s pyytää yhteystietojesi ja puheluhistoriasi käyttöoikeutta. Annetaanko käyttöoikeus (%2$s)?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Älä kysy uudestaan"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Älä kysy uudestaan"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Viestipyyntö"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s haluaa käyttää viestejäsi. Myönnetäänkö käyttöoikeus kohteeseen %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Päivämäärä- ja aika-asetukset"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Paikallinen (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Suuri tarkkuus"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Virransäästötila"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Vain laitteen antureilla"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Sijaintipalvelut"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Paikanna GPS:n ja wifi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Paikanna wifi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Paikanna sijainti GPS:n avulla"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Wifi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty wifi-yhteyden perusteella"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Vahvista tallennettu kuvio"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Yritä uudelleen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Piirrä lukituksenpoistokuvio:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Piirrä lukituksenpoistokuvio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Saat ohjeita painamalla Valikko-painiketta."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Nosta sormi, kun olet valmis."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Kuvio tallennettu."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vahvista piirtämällä kuvio uudelleen:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Uusi lukituksenpoistokuviosi:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Nosta sormi, kun olet valmis"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Kuvio tallennettu"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Vahvista piirtämällä kuvio uudelleen"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Uusi lukituksenpoistokuvio"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Vahvista"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Piirrä uudelleen"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Yritä uudelleen"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tämä palauttaa kaikki asetukset seuraaville:\n\n "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Sovellusten taustatietorajoitukset"</li>\n" "<li>"Kaikki oikeuksien rajoitukset"</li>\n\n" Et menetä mitään sovellustietoja."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nollaa sovellukset"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
     <string name="filter" msgid="2018011724373033887">"Suodata"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Esteettömyysasetukset"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Palvelut"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Tekstitykset"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurennuseleet"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kun tämä ominaisuus on käytössä, voit lähentää ja loitontaa kolmoisnapauttamalla ruutua.\n\nLähennetyssä tilassa voit\n"<ul><li>"panoroida vetämällä vähintään kahta sormea ruudun poikki"</li>\n<li>"säätää lähennyksen tasoa nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Voit myös suurentaa sormesi alla olevan kohteen väliaikaisesti kolmoisnapauttamalla ja pitämällä viimeisen napautuksen ruudulla. Suurennetussa tilassa voit tutkia ruudun eri osia sormella vetämällä. Nostamalla sormen pääset takaisin edelliseen tilaan.\n\nHuomaa: suurennus kolmoisnapauttamalla toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Asetukset"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Käytössä"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Pois käyt."</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Esikatselu"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Vakioasetukset"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Kieli"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tekstin koko"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Tekstin tyyli"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Omat asetukset"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Taustaväri"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Taustan läpinäkyvyys"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Tekstin väri"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Reunan väri"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Reunan tyyppi"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Kirjasinperhe"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Tekstitys näyttää tältä"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Oletus"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ei mitään"</string>
+    <string name="color_white" msgid="8045195170201590239">"Valkoinen"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Harmaa"</string>
+    <string name="color_black" msgid="7517353520909872561">"Musta"</string>
+    <string name="color_red" msgid="4949354900304125428">"Punainen"</string>
+    <string name="color_green" msgid="5537717328428845841">"Vihreä"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Sininen"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Turkoosi"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Keltainen"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> haluaa seuraavat luvat:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Tarkkaile toimintojasi"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Päivitä"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-käyttöjärjestelmä"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediapalvelin"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Käsittelytiedot"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Käsittelyn tarkat tiedot"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Valitse toinen moottori"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Tämä puhesynteesimoottori saattaa kerätä kaiken puhutun tekstin, mukaan lukien henkilökohtaiset tiedot kuten salasanat ja luottokorttinumerot. Se on lähtöisin moottorista <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Haluatko ottaa tämän puhesynteesimoottorin käyttöön?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Tämä kieli vaatii verkkoyhteyden, jotta tekstistä puheeksi muuntaminen toimii."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Tämä on esimerkki puhesynteesistä."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Oletuskieliasetus"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Kieltä <xliff:g id="LOCALE">%1$s</xliff:g> tuetaan"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Kieli <xliff:g id="LOCALE">%1$s</xliff:g> tarvitsee yhteyden verkostoon"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Kieltä <xliff:g id="LOCALE">%1$s</xliff:g> ei tueta"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Tarkistetaan"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moottorit"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-asetukset"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on käytössä"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"poistetaan käytöstä"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Sijainti"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronointi"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Kirkkaus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ota OpenGL-jälj. käyttöön"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näytä asettelun rajat"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Näytä leikkeiden rajat, marginaalit jne."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Pakota RTL-ulkoasun suunta"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Pakota kaikkien kielten näytön ulkoasun suunnaksi RTL"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Näytä suorittimen käyttö"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Näytön peittokuva näyttää nykyisen suoritinkäytön"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Pakota GPU-hahmonnus"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Napauta ja maksa"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Kysy aina"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Valitaanko asetukseksi?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Rajoitukset"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Poista rajoitukset"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Vaihda PIN-koodi"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 9c9d58a..79afe73 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Moyen"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Par défaut"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif condensé"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Espace simple"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Très petite"</item>
+    <item msgid="6781094565687692782">"Petite"</item>
+    <item msgid="8222123259497646551">"Normale"</item>
+    <item msgid="5813217276778560466">"Grande"</item>
+    <item msgid="9044232017390975191">"Très grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Aucun"</item>
+    <item msgid="1352974708028506778">"Contour"</item>
+    <item msgid="5850876295428722675">"Ombre projetée"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Texte noir sur fond blanc"</item>
+    <item msgid="1770533843436933500">"Texte blanc sur fond noir"</item>
+    <item msgid="1309255027325660115">"Texte jaune sur fond noir"</item>
+    <item msgid="2985943780939258562">"Texte jaune sur fond bleu"</item>
+    <item msgid="7520438652121629055">"Personnalisé"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Ne jamais autoriser"</item>
     <item msgid="1417929597727989746">"Toujours autoriser"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normale"</item>
+    <item msgid="4517779899383204000">"moyenne"</item>
+    <item msgid="406385694840950802">"faible"</item>
+    <item msgid="4212263919458209842">"critique"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a6223fe..ffec152 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Demande de répertoire"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s souhaite accéder à vos contacts et à l\'historique de vos appels. Autoriser l\'accès à %2$s ?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne plus me demander"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne plus me demander"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Demande d\'accès aux messages"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Une demande d\'accès à vos messages a été envoyée pour \"%1$s\". Accorder l\'accès à \"%2$s\" ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Format régional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de batterie"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Capteurs appareil uniquement"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Services de localisation"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utilis. GPS, réseaux Wi-Fi et mob. pour estimer position"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utilis. réseaux Wi-Fi et mob. pour estimer position"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utiliser GPS pour vous localiser"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseaux mobiles"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le code PIN de déverrouillage"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dessiner un schéma de déverrouillage :"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessinez un schéma de déverrouillage :"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ôtez le doigt lorsque vous avez terminé."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Reliez au moins <xliff:g id="NUMBER">%d</xliff:g> points. Veuillez réessayer :"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Schéma enregistré."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Redessinez le schéma pour confirmer :"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Votre nouveau schéma de déverrouillage :"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Relevez le doigt lorsque vous avez terminé."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Veuillez relier au moins <xliff:g id="NUMBER">%d</xliff:g> points. Veuillez réessayer."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Schéma enregistré"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Redessinez le schéma pour le confirmer."</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Votre nouveau schéma de déverrouillage"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmer"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Redessiner"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Réessayer"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n" Vous ne perdez aucune donnée liée aux applications."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestes d\'agrandissement"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Lorsque cette fonctionnalité est activée, vous pouvez effectuer des zooms avant et arrière en appuyant trois fois sur l\'écran.\n\nLorsque vous effectuez un zoom avant, vous pouvez :\n"<ul><li>"Effectuer un panoramique : faites glisser deux doigts ou plus sur l\'écran."</li>\n<li>"Régler le niveau de zoom : pincez deux doigts ou plus, ou écartez-les."</li></ul>\n\n"Vous pouvez également agrandir le contenu se trouvant sous votre doigt en appuyant trois fois sur l\'écran et en prolongeant la troisième pression. Lorsque la loupe est activée, vous pouvez faire glisser votre doigt sur l\'écran pour en explorer les différentes parties. Relevez votre doigt pour revenir à l\'état précédent.\n\nRemarque : vous pouvez appuyer trois fois sur l\'écran pour agrandir le contenu partout, sauf sur le clavier et la barre de navigation."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Paramètres"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activé"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Désactivé"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Aperçu"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Options standards"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Langue"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Taille de la police"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Style des sous-titres"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Options de personnalisation"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Couleur d\'arrière-plan"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacité de l\'arrière-plan"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Couleur du texte"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Couleur du contour"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Type de contour"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Famille de polices"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Aperçu des sous-titres"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Par défaut"</string>
+    <string name="color_none" msgid="3475640044925814795">"Aucune"</string>
+    <string name="color_white" msgid="8045195170201590239">"Blanc"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gris"</string>
+    <string name="color_black" msgid="7517353520909872561">"Noir"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rouge"</string>
+    <string name="color_green" msgid="5537717328428845841">"Vert"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Bleu"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Jaune"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observer vos actions"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualiser"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Plate-forme Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiques relatives aux processus"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistiques détaillées relatives aux processus en cours d\'exécution"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Utilisation de la mémoire"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Sélectionner un autre moteur"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ce moteur de synthèse vocale est susceptible de collecter tout ce qui sera lu, y compris les données personnelles comme les mots de passe et les numéros de carte de paiement. Il provient du moteur <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voulez-vous activer son utilisation ?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Une connexion réseau est nécessaire pour la synthèse vocale dans cette langue."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Voici un échantillon de synthèse vocale."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"État de la langue par défaut"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> sont compatibles."</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> nécessitent une connexion réseau."</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Les paramètres régionaux <xliff:g id="LOCALE">%1$s</xliff:g> ne sont pas compatibles."</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Vérification en cours..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moteurs"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Paramètres <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est activé."</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"désactivation"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Localisation"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisation"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatique"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer droite à gauche"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer orient. droite à gauche pour toutes langues"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
@@ -1916,6 +1952,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Fonctionnalité tap-and-pay"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Toujours demander"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Définir en tant que mode de paiement prioritaire ?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Annuler les restrictions"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le code PIN"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 4a54eb5..539f5b5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"मध्यम"</item>
     <item msgid="2372711992605524591">"अधिक"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"डिफ़ॉल्ट"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"मोनोस्पेस"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"बहुत छोटा"</item>
+    <item msgid="6781094565687692782">"छोटा"</item>
+    <item msgid="8222123259497646551">"सामान्य"</item>
+    <item msgid="5813217276778560466">"बड़ा"</item>
+    <item msgid="9044232017390975191">"बहुत बड़ा"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"कोई नहीं"</item>
+    <item msgid="1352974708028506778">"आउटलाइन"</item>
+    <item msgid="5850876295428722675">"ड्रॉप शैडो"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"सफ़ेद पर काला"</item>
+    <item msgid="1770533843436933500">"काले पर सफ़ेद"</item>
+    <item msgid="1309255027325660115">"काले पर पीला"</item>
+    <item msgid="2985943780939258562">"नीले पर पीला"</item>
+    <item msgid="7520438652121629055">"कस्टम"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"कभी भी अनुमति न दें"</item>
     <item msgid="1417929597727989746">"हमेशा अनुमति दें"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"सामान्‍य"</item>
+    <item msgid="4517779899383204000">"मध्यम"</item>
+    <item msgid="406385694840950802">"कम"</item>
+    <item msgid="4212263919458209842">"अत्यधिक"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7e0fa32..f0ede24 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"फ़ोन बुक अनुरोध"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s आपके संपर्कों और कॉल इतिहास में पहुंच प्राप्त करना चाहता है. %2$s पर पहुंच दें?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"फिर से न पूछें"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"फिर से न पूछें"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"संदेश का अनुरोध"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s आपके संदेशों को एक्सेस करना चाहता है. %2$s पर एक्सेस दें?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"दिनांक और समय सेटिंग"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"क्षेत्रीय (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"केवल उपकरण के सेंसर"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"स्‍थान सेवा"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"स्थान के अनुमान हेतु GPS, Wi-Fi व मो. नेटवर्क उपयोग करें"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"स्थान के अनुमान हेतु Wi-Fi व मो. नेटवर्क उपयोग करें"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"अपना स्थान बताने हेतु GPS उपयोग करें"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"पुनर्प्राप्त किया जा रहा है…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi और मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने हेतु, एप्लि. को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi द्वारा निर्धारित किया गया स्‍थान"</string>
@@ -1042,13 +1049,13 @@
     <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_wrong" msgid="4694973540770105678">"पुनः प्रयास करें:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"अनलॉक प्रतिमान आरेखित करें:"</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="4622772178078818425">"पूर्ण होने पर अंगुली हटा लें."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदु कनेक्‍ट करें. पुन: प्रयास करें:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"प्रतिमान रिकॉर्ड किया गया."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"पुष्टि के लिए पुन: प्रतिमान आरेखित करें:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"आपका नया अनलॉक प्रतिमान:"</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_confirm_button_text" msgid="1128204343957002841">"पुष्टि करें"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"पुन: प्रयास करें"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"एप्लि. प्राथमिकताएं रीसेट करें"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"एप्लि. प्राथमिकताएं रीसेट करें?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे निम्न की सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"कार्यवाहियों के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n" "<li>"अनुमति के कोई भी प्रतिबंध"</li>\n\n" आपका सभी एप्लिकेशन डेटा बना रहेगा."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"एप्लिकेशन रीसेट करें"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"पहुंच-योग्यता सेटिंग"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"सेवाएं"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"कैप्शन"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"आवर्धन जेस्चर"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"इस सुविधा के चालू होने पर, आप स्क्रीन को तीन बार टैप करके ज़ूम इन और आउट कर सकते हैं.\n\nज़ूम इन होने पर, आप निम्न कार्य कर सकते हैं:\n"<ul><li>"पैन करना: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."</li>\n<li>"ज़ूम स्तर एडजस्ट करना: दो या अधिक अंगुलियों को साथ में पिंच करें या उन्हें दूर फैलाएं."</li></ul>\n\n"आप तीन बार टैप करके और टैप किया हुआ रखकर, अपनी अंगुलियों के नीचे की सामग्री को अस्थायी रूप से आवर्धित भी कर सकते हैं. इस आवर्धित स्थिति में, आप स्क्रीन के विभिन्न भागों को एक्सप्लोर करने के लिए अपनी अंगुलियों को खींच सकते हैं. अपनी पूर्व स्थिति में पहुंचने के लिए अपनी अंगुली को उठाएं.\n\nध्यान दें: आवर्धन कार्यों के लिए कीबोर्ड और नेविगेशन बार को छोड़कर कहीं भी तीन बार टैप करें."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"पहुंच-योग्यता शॉर्टकट"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"सेटिंग"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"चालू"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"पूर्वावलोकन"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"मानक विकल्प"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"भाषा"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"पाठ का आकार"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"कैप्शन की शैली"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"कस्‍टम विकल्प"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"पृष्ठभूमि का रंग"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"पृष्ठभूमि पारदर्शिता"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"पाठ का रंग"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"किनारे का रंग"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"किनारे का प्रकार"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट परिवार"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्‍शन इस तरह दिखाई देंगे"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"डिफ़ॉल्ट"</string>
+    <string name="color_none" msgid="3475640044925814795">"कोई नहीं"</string>
+    <string name="color_white" msgid="8045195170201590239">"सफ़ेद"</string>
+    <string name="color_gray" msgid="9192312087142726313">"धूसर"</string>
+    <string name="color_black" msgid="7517353520909872561">"काला"</string>
+    <string name="color_red" msgid="4949354900304125428">"लाल"</string>
+    <string name="color_green" msgid="5537717328428845841">"हरा"</string>
+    <string name="color_blue" msgid="7731984529016953223">"नीला"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"हरिताभ नीला"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"पीला"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"मैजेंटा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"अपनी कार्यवाही ध्यान से देखें"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"रीफ़्रेश करें"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"मीडिया सर्वर"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रोसेस के आंकड़े"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"चल रही प्रोसेस के बारे में गहन आकंड़े"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"स्मृति उपयोग"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अन्‍य इंजन चुनें"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह वाक् संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी पाठ को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस वाक् संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"पाठ-से-वाक् आउटपुट के लिए इस भाषा को क्रियाशील नेटवर्क कनेक्शन की आवश्यकता है."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"यह वाक् संश्लेषण का एक उदाहरण है"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"डिफ़ॉल्ट भाषा स्थिति"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> पूरी तरह से समर्थित है"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> के लिए नेटवर्क कनेक्शन की आवश्यकता है"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> समर्थित नहीं है"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"जांच हो रही है..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"इंजन"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सेटिंग"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सक्षम किया गया है"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"चमक <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"क्लिप सीमाएं, मार्जिन, आदि दिखाएं."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL लेआउट दिशा लागू करें"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"सभी भाषाओं के लिए स्क्रीन लेआउट दिशा को RTL रखें"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"स्‍क्रीन ओवरले वर्तमान CPU उपयोग को दिखा रहा है"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"बलपूर्वक GPU रेंडर करें"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"फ़ॉन्ट आकार बदलें"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"टैप करें और भुगतान करें"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"हर बार पूछें"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"आपकी प्राथमिकता के रूप में सेट करें?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंधों को निकालें"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 7ae0e85..e0738ce 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Srednje"</item>
     <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Zadano"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif zgusnuti"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Neproporcionalni"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Vrlo mali"</item>
+    <item msgid="6781094565687692782">"Mali"</item>
+    <item msgid="8222123259497646551">"Uobičajeni"</item>
+    <item msgid="5813217276778560466">"Veliki"</item>
+    <item msgid="9044232017390975191">"Vrlo veliki"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ništa"</item>
+    <item msgid="1352974708028506778">"Obris"</item>
+    <item msgid="5850876295428722675">"Sjena"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Crno na bijelom"</item>
+    <item msgid="1770533843436933500">"Bijelo na crnom"</item>
+    <item msgid="1309255027325660115">"Žuto na crnom"</item>
+    <item msgid="2985943780939258562">"Žuto na plavom"</item>
+    <item msgid="7520438652121629055">"Prilagođeno"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Ne dopuštaj nikada"</item>
     <item msgid="1417929597727989746">"Dopusti uvijek"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"uobičajeno"</item>
+    <item msgid="4517779899383204000">"umjereno"</item>
+    <item msgid="406385694840950802">"nisko"</item>
+    <item msgid="4212263919458209842">"kritično"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ad1586e..4c221c8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Želite li se povezati s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Zahtjev telefonskog imenika"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Korisnik %1$s želio bi pristupiti vašim kontaktima i povijesti poziva. Dati pristup korisniku %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Više me ne pitaj"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Više me ne pitaj"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Zahtjev za poruku"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi pristupiti vašim porukama. Želite li dati pristup korisniku %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Postavke datuma i vremena"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionalno (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Štednja baterije"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo senzori uređaja"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Usluge lociranja"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Upotrebljavaj GPS, Wi‑Fi i mobilne mreže za procjenu lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Upotrebljavaj Wi‑Fi i mobilne mreže za procjenu lokacije"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Upotrebljavaj GPS za određivanje lokacije"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi i mob. mreža"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrdi spremljeni uzorak"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Pokušajte ponovo:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Iscrtajte uzorak za otključavanje:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Iscrtajte uzorak za otključavanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Izbornik za pomoć."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Maknite prst ako ste gotovi."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite barem ovoliko točaka: <xliff:g id="NUMBER">%d</xliff:g>. Pokušajte ponovo:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Uzorak je snimljen."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Ponovno iscrtajte uzorak za potvrdu:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Vaš novi uzorak za otključavanje:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Maknite prst ako ste gotovi"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Povežite barem ovoliko točaka: <xliff:g id="NUMBER">%d</xliff:g>. Pokušajte ponovo."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Uzorak je snimljen"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Ponovno iscrtajte uzorak za potvrdu"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Vaš novi uzorak za otključavanje"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdi"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Iscrtajte ponovno"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Pokušaj ponovo"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Sve postavke za sljedeće vratit će se na zadano:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"sva ograničenja dozvola."</li>\n\n" Nećete izgubiti podatke nijedne aplikacije."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Poništi aplikacije"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filtar"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke dostupnosti"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Opisi"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Pokret povećavanja"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ako je ova značajka uključena, možete povećati ili smanjiti prikaz ako triput dodirnete zaslon.\n\nNakon povećanja prikaza možete sljedeće:\n"<ul><li>"Pomicati: pomoću dva prsta ili više prstiju povlačite prikaz na zaslonu."</li>\n<li>"Podesiti razinu zumiranja: stisnite dva prsta ili više prstiju ili ih raširite."</li></ul>\n\n"Također možete privremeno povećati stavku ispod prsta ako je triput dodirnete i držite. U tom slučaju možete povlačiti prst kako biste istražili različite dijelove zaslona. Podignite prst kako biste se vratili na prijašnje stanje.\n\nNapomena: povećanje trostrukim dodirom moguće je svuda osim na tipkovnici i traci za navigaciju."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Postavke"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Uključeno"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Isključeno"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Pregled"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardne opcije"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Jezik"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Veličina teksta"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Stil opisa"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Prilagođene opcije"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Boja pozadine"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Zasjenjenost pozadine"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Boja teksta"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Boja ruba"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Vrsta ruba"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Obitelj fonta"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Opisi će izgledati ovako"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Zadano"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ništa"</string>
+    <string name="color_white" msgid="8045195170201590239">"Bijela"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Siva"</string>
+    <string name="color_black" msgid="7517353520909872561">"Crna"</string>
+    <string name="color_red" msgid="4949354900304125428">"Crvena"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zelena"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Plava"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Grimizna"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba obavljati sljedeće:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Praćenje vaših radnji"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Osvježi"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijski poslužitelj"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistički podaci o procesima"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Detaljni statistički podaci o trenutačnim procesima"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Upotreba memorije"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Odaberite drugi alat"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Alat za sintezu govora može prikupljati izgovoreni sadržaj, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. To omogućuje alat <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Želite li omogućiti alat za sintezu govora?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Da bi se dobili izlazni podaci pretvaranja teksta u govor za taj jezik, potrebna je aktivna veza s mrežom."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ovo je primjer sinteze govora"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status zadanog jezika"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> je u potpunosti podržan"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahtijeva mrežnu vezu"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nije podržan"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Provjera..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Alati"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> postavke"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkronizacija"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Svjetlina <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatski"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice izgleda"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Za isječak prikaži granice, margine itd."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Nametni zdesna ulijevo"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nametni smjer zdesna ulijevo za sve zemlje/jezike"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži upotrebu procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje trenutačnu upotrebu procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Prisilno GPU renderiranje"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dodirni i plati"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Pitaj svaki put"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite li to postaviti kao željeni način?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ograničenja"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Uklanjanje ograničenja"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promjena PIN-a"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index d28a7c3..5603dca 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Közepes"</item>
     <item msgid="2372711992605524591">"Hosszú"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Alapértelmezett"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif, sűrű betűköz"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Nagyon kicsi"</item>
+    <item msgid="6781094565687692782">"Kicsi"</item>
+    <item msgid="8222123259497646551">"Normál"</item>
+    <item msgid="5813217276778560466">"Nagy"</item>
+    <item msgid="9044232017390975191">"Nagyon nagy"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Semelyik"</item>
+    <item msgid="1352974708028506778">"Vázlat"</item>
+    <item msgid="5850876295428722675">"Árnyékolás"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Fehér alapon fekete"</item>
+    <item msgid="1770533843436933500">"Fekete alapon fehér"</item>
+    <item msgid="1309255027325660115">"Fekete alapon sárga"</item>
+    <item msgid="2985943780939258562">"Kék alapon sárga"</item>
+    <item msgid="7520438652121629055">"Egyéni"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Soha nem engedélyezem"</item>
     <item msgid="1417929597727989746">"Engedélyezés mindig"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normál"</item>
+    <item msgid="4517779899383204000">"közepes"</item>
+    <item msgid="406385694840950802">"alacsony"</item>
+    <item msgid="4212263919458209842">"kritikus"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f407190..82b96ed 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Szeretne csatlakozni a következő eszközhöz: \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonkönyv kérése"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"A(z) %1$s szeretne hozzáférni névjegyeihez és a híváselőzményekhez. Megadja a hozzáférést a(z) %2$s eszköznek?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne jelenjen meg többé"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne jelenjen meg többé"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Üzenetkérés"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"A(z) %1$s hozzáférést kér üzeneteihez. Biztosítja a(z) %2$s számára a hozzáférést?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Dátum és idő beállításai"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionális (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nagyon pontos"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiatakarékos"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Csak az eszköz érzékelői"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Helyszolgáltatá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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS/Wi-Fi/mobil helybecsléshez"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi-Fi/mobilhál. helybecsléshez"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Hely meghatározása GPS-szel"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Hely Wi-Fi és mobilhálózat alapján"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Helymeghatározás Wi-Fi-vel"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN-kód módosítása"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Erősítse meg az elmentett mintát"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Próbálja újra:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Rajzoljon feloldómintát:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rajzoljon egy feloldási mintát"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Emelje fel az ujját, ha kész."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kapcsoljon össze legalább <xliff:g id="NUMBER">%d</xliff:g> pontot. Próbálkozzon újra:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"A minta rögzítve!"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Rajzolja újra a mintát a megerősítéshez:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Az új feloldási minta:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Emelje fel az ujját, ha kész"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Kapcsoljon össze legalább <xliff:g id="NUMBER">%d</xliff:g> pontot. Próbálkozzon újra."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"A minta rögzítve"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Rajzolja újra a mintát a megerősítéshez"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Az új feloldási minta"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Megerősítés"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Újrarajzolás"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Újra"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásértesítések"</li>\n" "<li>"Alapértelmezett alkalmazások adott műveletekhez"</li>\n" "<li>"Alkalmazások háttéradat-korlátozása"</li>\n" "<li>"Minden engedélykorlátozás"</li>\n\n" Az alkalmazásadatok nem vesznek el."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Terület kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Kisegítő lehetőségek beállításai"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Szolgáltatások"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Képaláírások"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Nagyítási kézmozdulatok"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ha a funkció be van kapcsolva, úgy kicsinyíthet/nagyíthat, hogy háromszor rákoppint a képernyőre.\n\nNagyított állapotban:\n"<ul><li>"Pásztázhat: Két vagy több ujját húzza végig a képernyőn."</li>\n<li>"Módosíthatja a nagyítási szintet: Két ujját húzza össze vagy távolítsa el egymástól."</li></ul>\n\n"Ideiglenesen felnagyíthatja az ujja alatt lévő részt is, úgy hogy hármat koppint és lenyomva hagyja ujját. A nagyított nézetben az ujját húzva fedezheti fel a képernyő más részeit is. Az ujja felemelésével visszatérhet az előző állapotra.\n\nMegjegyzés: A háromszoros koppintással való nagyítás a billentyűzet és a navigációs sáv kivételével mindenhol működik."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hozzáférési gyorskombináció"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Beállítások"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"be"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ki"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Előnézet"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Alapértelmezett beállítások"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Nyelv"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Szöveg mérete"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Felirat stílusa"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Egyéni beállítások"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Háttérszín"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Háttér áttetszősége"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Szöveg színe"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Szegély színe"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Szegély típusa"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Betűcsalád"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"A feliratok így fognak kinézni"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Alapértelmezett"</string>
+    <string name="color_none" msgid="3475640044925814795">"Semelyik"</string>
+    <string name="color_white" msgid="8045195170201590239">"Fehér"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Szürke"</string>
+    <string name="color_black" msgid="7517353520909872561">"Fekete"</string>
+    <string name="color_red" msgid="4949354900304125428">"Piros"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zöld"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Kék"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Zöldeskék"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Sárga"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Műveletek megfigyelése"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Frissítés"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Médiaszerver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Memóriahasználat"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Válasszon másik motort"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ez a beviteli módszer alkalmas lehet az elhangzott szövegek -- köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motor kapcsolta be. Engedélyezi ennek a beszédszintetizáló motornak a használatát?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Ez a nyelv működő hálózati kapcsolatot igényel a szövegfelolvasáshoz."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ez egy példa a beszédszintézisre"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Alapértelmezett nyelv állapota"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelv teljes mértékben támogatott"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelv használatához hálózati kapcsolatra van szükség"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"A(z) <xliff:g id="LOCALE">%1$s</xliff:g> nyelv nem támogatott"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Ellenőrzés..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorok"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> beállításai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engedélyezve van"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"kikapcsolás"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Tartózkodási hely"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Szinkronizálás"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Fényerő: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatikus"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Elrendezés jobbról balra"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Elrendezés jobbról balra minden nyelvnél"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Képernyőfedvény a jelenlegi CPU-használattal"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-megjelenítés"</string>
@@ -1916,6 +1952,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Érintéssel való fizetés"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Mindig rákérdez"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Beállítja preferenciaként?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Korlátozások feloldása"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kód módosítása"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index a9c44dd..546a136 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Sedang"</item>
     <item msgid="2372711992605524591">"Lama"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Default"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Sangat kecil"</item>
+    <item msgid="6781094565687692782">"Kecil"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Besar"</item>
+    <item msgid="9044232017390975191">"Sangat besar"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Tidak ada"</item>
+    <item msgid="1352974708028506778">"Garis batas"</item>
+    <item msgid="5850876295428722675">"Bayangan jatuh"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Hitam berlatar putih"</item>
+    <item msgid="1770533843436933500">"Putih berlatar hitam"</item>
+    <item msgid="1309255027325660115">"Kuning berlatar hitam"</item>
+    <item msgid="2985943780939258562">"Kuning berlatar biru"</item>
+    <item msgid="7520438652121629055">"Khusus"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Jangan pernah izinkan"</item>
     <item msgid="1417929597727989746">"Selalu izinkan"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"menengah"</item>
+    <item msgid="406385694840950802">"rendah"</item>
+    <item msgid="4212263919458209842">"kritis"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b8323ec..4bd1b85 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telepon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ingin mengakses kontak dan riwayat panggilan Anda. Berikan akses ke %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Permintaan pesan"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses pesan Anda. Berikan akses pada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Daerah (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Khusus sensor perangkat"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi mati"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Layanan lokasi"</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>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Pakai GPS, Wi‑Fi, &amp; jaringan seluler utk perkiraan lokasi"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Pakai Wi‑Fi &amp; jaringan seluler utk perkiraan lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Pakai GPS utk penentuan lokasi"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Perkiraan lokasi pakai GPS, Wi‑Fi &amp; data seluler"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Perkiraan lokasi pakai Wi‑Fi &amp; data seluler"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Penentuan lokasi pakai GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Lokasi Wi-Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi yang ditentukan oleh Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ubah PIN pembuka kunci"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Konfirmasi pola tersimpan"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Coba lagi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Gambar pola pembuka kunci"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Buat pola pembuka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk bantuan."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Angkat jari ketika selesai."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambungkan paling tidak <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Pola dicatat."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Buat pola lagi untuk mengonfirmasi:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Pola pembuka kunci baru Anda:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Angkat jari ketika selesai"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Sambungkan setidaknya <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Pola direkam"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Gambar pola lagi untuk mengonfirmasi"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Pola pembuka kunci baru Anda"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Konfirmasi"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Gambar ulang"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Coba Lagi"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tampilkn proses pd tmbolok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hal ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batasan data latar belakang untuk aplikasi"</li>\n" "<li>"Batasan izin apa pun"</li>\n\n" Data aplikasi Anda tidak akan hilang."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setelan aksesibilitas"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Layanan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Teks"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Isyarat pembesaran"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Saat fitur ini diaktifkan, Anda dapat memperbesar dan memperkecil dengan mengetuk layar tiga kali.\n\nSaat memperbesar, Anda dapat:\n"<ul><li>"Menggeser: Seret dua jari atau lebih melintasi layar."</li>\n<li>"Menyesuaikan tingkat pembesaran/pengecilan: Cubit dua jari atau lebih bersamaan atau rentangkan jari Anda."</li></ul>\n\n"Anda juga dapat memperbesar yang ada di bawah jari Anda secara sementara dengan mengetuk tiga kali lalu tahan. Dalam keadaan yang diperbesar ini, Anda dapat menyeret jari untuk menjelajah bagian layar yang berbeda. Angkat jari Anda untuk mengembalikan ke keadaan sebelumnya.\n\nCatatan: Ketukan tiga kali untuk pembesaran bekerja di mana pun kecuali pada keyboard dan bilah navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aktif"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Nonaktif"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Pratinjau"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opsi standar"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Bahasa"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Ukuran teks"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Gaya teks"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opsi khusus"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Warna latar belakang"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opasitas latar belakang"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Warna teks"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Warna tepi"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Jenis tepi"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Jenis font"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Teks akan terlihat seperti ini"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_none" msgid="3475640044925814795">"Tidak ada"</string>
+    <string name="color_white" msgid="8045195170201590239">"Putih"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Abu-abu"</string>
+    <string name="color_black" msgid="7517353520909872561">"Hitam"</string>
+    <string name="color_red" msgid="4949354900304125428">"Merah"</string>
+    <string name="color_green" msgid="5537717328428845841">"Hijau"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Biru"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Sian"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Kuning"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Mengamati tindakan Anda"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Segarkan"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistik teknis tentang proses yang berjalan"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesis suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini perlu sambungan jaringan yang bekerja untuk keluaran text-to-speech."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ini adalah contoh sintesis suara"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status bahasa default"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> didukung sepenuhnya"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> membutuhkan sambungan jaringan"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> tidak didukung"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Memeriksa..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mesin"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"menonaktifkan"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokasi"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkronisasi"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatis"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tampilkan batas tata letak"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tampilkan batas klip, margin, dll."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah tata letak RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah tata letak layar RTL untuk semua lokal"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tampilkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Hamparan layar menampilkan penggunaan CPU saat ini"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa perenderan GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Ketuk dan Bayar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanyakan setiap kali"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan preferensi Anda?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Batasan"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Hapus batasan"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ubah PIN"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 8fce9aa..d1e4c39 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Lungo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predefinito"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Molto piccole"</item>
+    <item msgid="6781094565687692782">"Piccole"</item>
+    <item msgid="8222123259497646551">"Medie"</item>
+    <item msgid="5813217276778560466">"Grandi"</item>
+    <item msgid="9044232017390975191">"Molto grandi"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Nessuno"</item>
+    <item msgid="1352974708028506778">"Contorno"</item>
+    <item msgid="5850876295428722675">"Ombreggiatura"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Nero su bianco"</item>
+    <item msgid="1770533843436933500">"Bianco su nero"</item>
+    <item msgid="1309255027325660115">"Giallo su nero"</item>
+    <item msgid="2985943780939258562">"Giallo su blu"</item>
+    <item msgid="7520438652121629055">"Personalizzato"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Non consentire mai"</item>
     <item msgid="1417929597727989746">"Consenti sempre"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normale"</item>
+    <item msgid="4517779899383204000">"medio"</item>
+    <item msgid="406385694840950802">"basso"</item>
+    <item msgid="4212263919458209842">"critico"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b40f719..a6d0c49 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vuoi connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Richiesta rubrica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s desidera accedere ai tuoi contatti e alla tua cronologia chiamate. Consentire l\'accesso a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Non chiedermelo più"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Non chiedermelo più"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Richiesta di accesso ai messaggi"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s desidera accedere ai tuoi messaggi. Dare accesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Impostazioni data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionale (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Risparmio della batteria"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Solo sensori dispositivo"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Servizi di localizzazione"</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>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Reti GPS, Wi-Fi e mobili posiz."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Reti Wi-Fi e mobili per posiz."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usa GPS per posizione"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Reti GPS, Wi-Fi e mobili per la stima della posizione"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Reti Wi-Fi e mobili per la stima della posizione"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usa GPS per individuare la posizione"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Recupero…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Posizione Wi‑Fi e rete mobile"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Consenti alle app di usare localizzazione Google per stabilire la tua posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posizione determinata da Wi‑Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambia PIN di sblocco"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Riprova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Inserisci una sequenza di sblocco:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Inserisci una sequenza di sblocco"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premi Menu per visualizzare la guida."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Allontana il dito al termine."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Collega almeno <xliff:g id="NUMBER">%d</xliff:g> punti. Riprova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Sequenza registrata."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Inserisci di nuovo la sequenza per confermare:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nuova sequenza di sblocco:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Solleva il dito al termine"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Collega almeno <xliff:g id="NUMBER">%d</xliff:g> punti. Riprova."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Sequenza registrata"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Inserisci di nuovo la sequenza per confermare"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Nuova sequenza di sblocco"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Conferma"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Ricrea"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Riprova"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Verranno reimpostate tutte le preferenze relative a:\n\n "<li>"App disattivate"</li>\n" "<li>"notifiche di app disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni di dati in background per app"</li>\n" "<li>"Eventuali limitazioni di autorizzazione"</li>\n\n" Non perderai i dati delle app."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta app"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accessibilità"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servizi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Sottotitoli"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesti di ingrandimento"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando questa funzione è attiva puoi aumentare e diminuire lo zoom toccando tre volte lo schermo.\n\nDopo avere aumentato lo zoom puoi:\n"<ul><li>"Eseguire una panoramica: trascina due o più dita sullo schermo."</li>\n<li>"Regolare il livello di zoom: unisci due o più dita come per fare un pizzicotto o allontanale."</li></ul>\n\n"Puoi anche ingrandire temporaneamente l\'area su cui hai il dito toccando tre volte e tenendo premuto. Nello stato ingrandito puoi trascinare il dito per esaminare parti diverse dello schermo. Solleva il dito per tornare allo stato precedente.\n\nNota. Il tocco triplo per ingrandire funziona ovunque tranne che per la tastiera e la barra di navigazione."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Collegamento Accessibilità"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Attiva"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Non attiva"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Anteprima"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opzioni standard"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Lingua"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Dimensioni testo"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Stile sottotitoli"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opzioni personalizzate"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Colore sfondo"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacità sfondo"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Colore del testo"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Colore bordo"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipo di bordo"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Famiglia di caratteri"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"I sottotitoli verranno visualizzati come segue:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predefinita"</string>
+    <string name="color_none" msgid="3475640044925814795">"Nessuno"</string>
+    <string name="color_white" msgid="8045195170201590239">"Bianco"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grigio"</string>
+    <string name="color_black" msgid="7517353520909872561">"Nero"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rosso"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blu"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Ciano"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Giallo"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Osservare le tue azioni"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Aggiorna"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistiche sui processi"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistiche tecniche sui processi in esecuzione"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Memoria usata"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Scegli un altro motore"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Questo motore di sintesi vocale potrebbe essere in grado di raccogliere tutto il testo pronunciato, inclusi dati personali come password e numeri di carte di credito. Deriva dal motore <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Abilitare l\'uso di questo motore di sintesi vocale?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Questa lingua richiede una connessione di rete funzionante per l\'output di sintesi vocale."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Questo è un esempio di sintesi vocale"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Stato della lingua predefinito"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> completamente supportato"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> richiede connessione di rete"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> non supportato"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Controllo in corso..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motori"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Impostazioni di <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è abilitato"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"disattivazione"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Posizione"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizzazione"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosità: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Attiva tracce OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra limiti di layout"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra limiti, margini dei clip e così via"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forza direzione layout RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direzione layout schermo RTL per tutte le lingue"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra utilizzo CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay schermo che mostra l\'uso corrente della CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forza rendering GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocca e paga"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Chiedi ogni volta"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Impostare come preferenza?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Limitazioni"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Rimuovi limitazioni"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 0703a70..a4f2697 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"בינוני"</item>
     <item msgid="2372711992605524591">"ארוך"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"ברירת מחדל"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif דחוס"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"רווח יחיד"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"קטן מאוד"</item>
+    <item msgid="6781094565687692782">"קטן"</item>
+    <item msgid="8222123259497646551">"רגיל"</item>
+    <item msgid="5813217276778560466">"גדול"</item>
+    <item msgid="9044232017390975191">"גדול מאוד"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"ללא"</item>
+    <item msgid="1352974708028506778">"קו מתאר"</item>
+    <item msgid="5850876295428722675">"הטלת צללית"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"שחור על גבי לבן"</item>
+    <item msgid="1770533843436933500">"לבן על גבי שחור"</item>
+    <item msgid="1309255027325660115">"צהוב על גבי שחור"</item>
+    <item msgid="2985943780939258562">"צהוב על גבי כחול"</item>
+    <item msgid="7520438652121629055">"מותאם אישית"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"לעולם אל תאפשר"</item>
     <item msgid="1417929597727989746">"אפשר תמיד"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"רגיל"</item>
+    <item msgid="4517779899383204000">"בינוני"</item>
+    <item msgid="406385694840950802">"נמוך"</item>
+    <item msgid="4212263919458209842">"קריטי"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index bbb90e9..22b7022 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"האם ברצונך להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"בקשה לספר טלפונים"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s רוצה לגשת לאנשי הקשר ולהיסטוריית השיחות שלך. האם להעניק ל-%2$s גישה?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"אל תשאל שוב"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"אל תשאל שוב"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"בקשת הודעה"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s רוצה לגשת להודעות שלך. להעניק גישה ל-%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"הגדרות תאריך ושעה"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"בחר אזור זמן"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"אזורי (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -593,7 +596,7 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"הגדרת האבטחה של הנתב האלחוטי (TKIP) אינה נתמכת"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"האימות נכשל. נסה שוב."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"אותרה פעילות WPS נוספת באתר. נסה שוב בעוד מספר דקות."</string>
-    <string name="wifi_ssid" msgid="641393708309146745">"של הרשת SSID"</string>
+    <string name="wifi_ssid" msgid="641393708309146745">"SSID של הרשת"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"הזן את ה-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"עוצמת אות"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"רמת דיוק גבוהה"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"חיסכון בעוצמת סוללה"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"חיישני המכשיר בלבד"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"מיקום כבוי"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"בקשות של מיקומים אחרונים"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"שירותי מיקום"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"מיקום עם GPS‏, Wi-Fi ורשתות"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"מיקום עם Wi-Fi ורשתות לנייד"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"השתמש ב-GPS למיקום מדויק"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"מיקום רשת Wi-Fi ורשת לנייד"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"אפשר ליישומים להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה PIN לביטול נעילה"</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="2063630508212535241">"שרטט דוגמת ביטול נעילה:"</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="4622772178078818425">"שחרר את האצבע כשתסיים."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"חבר <xliff:g id="NUMBER">%d</xliff:g> נקודות לפחות. נסה שוב:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"הקו נרשם."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"צייר קו שוב כדי לאשר:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"קו ביטול הנעילה החדש:"</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_confirm_button_text" msgid="1128204343957002841">"אשר"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"צייר שוב"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"נסה שוב"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות יישום"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות יישום?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"הפעולה תאפס את כל ההעדפות עבור:\n\n "<li>"אפליקציות מושבתות"</li>\n" "<li>"הודעות של אפליקציות מושבתות"</li>\n" "<li>"אפליקציות בברירת מחדל לביצוע פעולות"</li>\n" "<li>"הגבלות של נתוני רקע עבור אפליקציות"</li>\n<li></li>" \nהגבלות הרשאה כלשהן\n לא תאבד נתוני אפליקציות."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס יישומים"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"הגדרות נגישות"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"שירותים"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"כיתובים"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"תנועות לשינוי גודל"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"כשתכונה זו מופעלת, ניתן להתקרב ולהתרחק באמצעות הקשה משולשת על המסך.\n\nבזמן שההצגה מוגדלת ניתן:\n"<ul><li>"להזיז לצדדים: גרור שתי אצבעות או יותר לאורך המסך."</li>\n<li>"לשנות את מידת ההגדלה: עשה תנועת צביטה באמצעות שתי אצבעות או הרחק אותן אחת מהשנייה."</li></ul>\n\n"ניתן גם להגדיל באופן זמני את הפריט שמתחת לאצבע על ידי הקשה משולשת והחזקה. במצב הגדלה זה ניתן לגרור את האצבע על מנת להציג כך חלקים שונים במסך. הרם את האצבע כדי לחזור למצב הקודם.\n\nשים לב: הקשה משולשת להגדלה פועלת בכל מקום מלבד במקלדת ובסרגל הניווט."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"קיצור נגישות"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"הגדרות"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"פועל"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"כבוי"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"תצוגה מקדימה"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"אפשרויות רגילות"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"שפה"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"גודל טקסט"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"סגנון כיתוב"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"אפשרויות מותאמות אישית"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"צבע הרקע"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"שקיפות הרקע"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"צבע טקסט"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"צבע קצה"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"סוג קצה"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"משפחת גופנים"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"כיתובים יראו כך"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"ברירת מחדל"</string>
+    <string name="color_none" msgid="3475640044925814795">"ללא"</string>
+    <string name="color_white" msgid="8045195170201590239">"לבן"</string>
+    <string name="color_gray" msgid="9192312087142726313">"אפור"</string>
+    <string name="color_black" msgid="7517353520909872561">"שחור"</string>
+    <string name="color_red" msgid="4949354900304125428">"אדום"</string>
+    <string name="color_green" msgid="5537717328428845841">"ירוק"</string>
+    <string name="color_blue" msgid="7731984529016953223">"כחול"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"ציאן"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"צהוב"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"מגנטה"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> צריך:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"הצג את הפעולות שלך"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"רענן"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"סטטיסטיקה של תהליך"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"סטטיסטיקה של מומחי מחשבים על התהליכים הפועלים"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"זיכרון בשימוש"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"בחר מנוע אחר"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ייתכן שמנוע סינתזת דיבור זה יכול לאסוף את כל הטקסט המדובר, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיסי אשראי. הוא מגיע מהמנוע <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. להפוך את השימוש במנוע סינתזת דיבור זה לפעיל?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"שפה זו דורשת חיבור רשת פעיל עבור פלט טקסט לדיבור."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"זוהי דוגמה לסינתזת דיבור"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"סטטוס שפה בברירת מחדל"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> נתמכת באופן מלא"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> מצריכה חיבור לרשת"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> אינה נתמכת"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"בודק..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"מנועים"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"הגדרות <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מופעל"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"מכבה"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"מיקום"</string>
     <string name="gadget_sync" msgid="858895763714222152">"סנכרון"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"בהירות <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"אוטומטי"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"הפעל מעקבי OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"הצג את גבולות הפריסה"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"הצג גבולות קליפ, שוליים וכו\'"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"אלץ כיוון פריסה מימין לשמאל"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"אלץ כיוון פריסת מסך מימין לשמאל עבור כל השפות בכל המקומות"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"הצג את השימוש ב-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"אלץ עיבוד ב-GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"הקש ושלם"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"שאל בכל פעם"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"האם להגדיר בתור ההעדפה שלך?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה PIN"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a60ea5b..3758cc5 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長め"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"デフォルト"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif Condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"固定幅"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"極小"</item>
+    <item msgid="6781094565687692782">"小"</item>
+    <item msgid="8222123259497646551">"標準"</item>
+    <item msgid="5813217276778560466">"大"</item>
+    <item msgid="9044232017390975191">"極大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"なし"</item>
+    <item msgid="1352974708028506778">"アウトライン"</item>
+    <item msgid="5850876295428722675">"ドロップシャドウ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"白地に黒"</item>
+    <item msgid="1770533843436933500">"黒地に白"</item>
+    <item msgid="1309255027325660115">"黒地に黄色"</item>
+    <item msgid="2985943780939258562">"青地に黄色"</item>
+    <item msgid="7520438652121629055">"カスタム"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"許可しない"</item>
     <item msgid="1417929597727989746">"常に許可する"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"標準"</item>
+    <item msgid="4517779899383204000">"やや不足"</item>
+    <item msgid="406385694840950802">"かなり不足"</item>
+    <item msgid="4212263919458209842">"残りわずか"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7de3c01..d91940a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -167,7 +167,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続してもよろしいですか？"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話帳のリクエスト"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$sが連絡先と通話履歴にアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"次回から表示しない"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"次回から表示しない"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"メッセージリクエスト"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$sがメッセージにアクセスしようとしています。%2$sにアクセスを許可しますか？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"地域（<xliff:g id="DATE">%s</xliff:g>）"</string>
@@ -991,12 +994,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"バッテリー節約"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"端末センサーのみ"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"現在地OFF"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近の位置情報リクエスト"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"位置情報サービス"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS、Wi‑Fi、モバイルネットワークで現在地を推定します"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fiとモバイルネットワークで現在地を推定します"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPSで現在地を特定します"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
@@ -1044,13 +1052,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ロック解除PINを変更"</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="2063630508212535241">"ロック解除パターンを入力"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ロック解除パターンを入力"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"MENUキーでヘルプ表示"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"描き終わりの点で指を離します。"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"少なくとも<xliff:g id="NUMBER">%d</xliff:g>つの点を結んでください。"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"パターンが記録されました。"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"確認のため、もう一度パターンを入力してください"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"新しいロック解除パターン:"</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_confirm_button_text" msgid="1128204343957002841">"確認"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"再入力"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"やり直す"</string>
@@ -1118,8 +1126,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"設定をリセットしますか？"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"この操作により、次の設定がすべてリセットされます:\n\n "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n" "<li>"権限のすべての制限"</li>\n\n"アプリのデータが失われることはありません。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"アプリをリセット"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
@@ -1358,6 +1365,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ユーザー補助の設定"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"サービス"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"システム"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"拡大操作"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"この機能をオンにすると、画面をトリプルタップして画面を拡大/縮小できます。\n\n拡大した画面で次のことを実行できます:\n"<ul><li>"パン: 2本以上の指で画面上をドラッグします。"</li>\n<li>"拡大レベルの調整: 2本以上の指でピンチイン/ピンチアウトします。"</li></ul>\n\n"また、トリプルタップして押し続けると、指の下の部分を一時的に拡大することができます。この状態で、指をドラッグして画面の別の部分に移動することができます。指を画面から離すと元の状態に戻ります。\n\n注意: トリプルタップで拡大する方法は、キーボードとナビゲーションバー以外で使用できます。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ユーザー補助のショートカット"</string>
@@ -1374,6 +1382,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ON"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"プレビュー"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"標準オプション"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"言語"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"文字サイズ"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"字幕スタイル"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"カスタマイズオプション"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"背景色"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"背景の透明度"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"テキストの色"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"エッジの色"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"エッジの種類"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"フォントファミリー"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"字幕サンプル"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aあ"</string>
+    <string name="locale_default" msgid="2593883646136326969">"デフォルト"</string>
+    <string name="color_none" msgid="3475640044925814795">"なし"</string>
+    <string name="color_white" msgid="8045195170201590239">"白"</string>
+    <string name="color_gray" msgid="9192312087142726313">"グレー"</string>
+    <string name="color_black" msgid="7517353520909872561">"黒"</string>
+    <string name="color_red" msgid="4949354900304125428">"赤"</string>
+    <string name="color_green" msgid="5537717328428845841">"緑"</string>
+    <string name="color_blue" msgid="7731984529016953223">"青"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"水色"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"黄"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"マゼンタ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"操作の監視"</string>
@@ -1471,6 +1504,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"更新"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"メディアサーバー"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"プロセスの統計情報"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"プロセスの実行に関する独自の統計情報"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"メモリ使用"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1504,16 +1542,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"別のエンジンを選択"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"この音声合成エンジンを使用すると、読み上げるすべてのテキストの収集をエンジン（<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この音声合成エンジンを有効にしますか？"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"この言語でテキスト読み上げを出力するには、ネットワーク接続が正常に機能している必要があります。"</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"これは音声合成のサンプルです"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"デフォルトの言語のステータス"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>は完全サポート対象です"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>ではネットワーク接続が必要です"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>はサポート対象ではありません"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"確認しています..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"エンジン"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>の設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は有効です"</string>
@@ -1540,7 +1574,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"OFFにしています"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"現在地"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同期"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"画面の明るさ<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
@@ -1728,6 +1762,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
     <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTLレイアウト方向を使用"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"すべての言語/地域で画面レイアウト方向をRTLに設定"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPUレンダリングを使用"</string>
@@ -1920,6 +1956,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"タップしてお支払い"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"その都度確認"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"設定として保存しますか？"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"制限"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"制限を削除"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PINを変更"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 40788ec..e231f1e 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"보통"</item>
     <item msgid="2372711992605524591">"길게"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"기본값"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"좁은 Sans-serif"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"고정 너비"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"아주 작게"</item>
+    <item msgid="6781094565687692782">"작게"</item>
+    <item msgid="8222123259497646551">"보통"</item>
+    <item msgid="5813217276778560466">"크게"</item>
+    <item msgid="9044232017390975191">"아주 크게"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"없음"</item>
+    <item msgid="1352974708028506778">"윤곽선"</item>
+    <item msgid="5850876295428722675">"그림자"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"흰색 바탕에 검정색"</item>
+    <item msgid="1770533843436933500">"검정색 바탕에 흰색"</item>
+    <item msgid="1309255027325660115">"검정색 바탕에 노란색"</item>
+    <item msgid="2985943780939258562">"파란색 바탕에 흰색"</item>
+    <item msgid="7520438652121629055">"맞춤설정"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"허용 안함"</item>
     <item msgid="1417929597727989746">"항상 허용"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"정상"</item>
+    <item msgid="4517779899383204000">"보통"</item>
+    <item msgid="406385694840950802">"낮음"</item>
+    <item msgid="4212263919458209842">"심각"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3ba1c9e..1192d3d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하시겠습니까?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"전화번호부 요청"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s이(가) 주소록과 통화 기록에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"다시 묻지 않음"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"다시 묻지 않음"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"메시지 요청"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s이(가) 메시지에 액세스하려고 합니다. %2$s에 액세스 권한을 제공하시겠습니까?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"기본값(<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -311,8 +314,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"사용자 정보"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"잠금 화면에 프로필 정보 표시"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"프로필 정보"</string>
-    <!-- no translation found for location_settings_title (1369675479310751735) -->
-    <skip />
+    <string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
@@ -986,25 +988,20 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"인터넷에 연결하세요."</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
-    <!-- no translation found for location_mode_title (3982009713118421689) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_title (8241802585110932849) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
-    <skip />
-    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
-    <skip />
-    <!-- no translation found for location_category_location_services (7437150886946685979) -->
-    <skip />
-    <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
+    <string name="location_mode_title" msgid="3982009713118421689">"모드"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"높은 정확성"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"배터리 절약"</string>
+    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"기기 센서 전용"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"위치 정보 사용 안함"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"최근 위치 요청"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"위치 서비스"</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>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi 및 모바일 네트워크를 사용하여 위치를 예측합니다."</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi 및 모바일 네트워크를 사용하여 위치를 예측합니다."</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS를 사용하여 현재 위치를 정확하게 찾습니다."</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
     <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 및 모바일 네트워크 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 예측하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
@@ -1053,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"잠금해제 PIN 변경"</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="2063630508212535241">"잠금해제 패턴 그리기:"</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="4622772178078818425">"완료되면 손가락을 뗍니다."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결합니다. 다시 시도하세요."</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"패턴이 기록되었습니다."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"확인을 위해 패턴 다시 그리기"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"새 잠금해제 패턴:"</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_confirm_button_text" msgid="1128204343957002841">"확인"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"다시 그리기"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"다시 시도"</string>
@@ -1127,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 재설정"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 재설정하시겠습니까?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"이 작업을 수행하면\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n" "<li>"그 밖의 권한 제한"</li>"에 대한 모든 환경설정이 재설정됩니다.\n\n 앱 데이터는 손실되지 않습니다."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"앱 재설정"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
@@ -1367,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"접근성 설정"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"서비스"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"시스템"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"캡션"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"확대 동작"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"이 기능을 사용하면 화면을 3번 탭하여 확대 및 축소할 수 있습니다.\n\n화면을 확대한 상태에서 다음 작업을 수행할 수 있습니다.\n"<ul><li>"이동: 화면에서 두 개 이상의 손가락을 드래그"</li>\n<li>"확대/축소 수준 조정: 두 개 이상의 손가락을 오므리거나 벌림"</li></ul>\n\n"또한 3번 탭한 상태를 유지하여 손가락 아래에 있는 항목을 일시적으로 확대할 수 있습니다. 확대한 상태에서 손가락을 드래그하여 화면의 다른 부분을 탐색할 수 있습니다. 손가락을 떼면 이전 상태로 돌아갑니다.\n\n참고: 세 번 탭하여 확대 기능은 키보드와 탐색 바에서는 작동하지 않습니다."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"접근성 단축키"</string>
@@ -1383,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"설정"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"사용"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"사용 안함"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"미리보기"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"표준 옵션"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"언어"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"텍스트 크기"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"캡션 스타일"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"맞춤설정 옵션"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"배경색"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"배경 불투명도"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"텍스트 색상"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"가장자리 색상"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"가장자리 유형"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"글꼴 모음"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"캡션이 다음과 같이 표시됩니다."</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"기본값"</string>
+    <string name="color_none" msgid="3475640044925814795">"없음"</string>
+    <string name="color_white" msgid="8045195170201590239">"흰색"</string>
+    <string name="color_gray" msgid="9192312087142726313">"회색"</string>
+    <string name="color_black" msgid="7517353520909872561">"검정색"</string>
+    <string name="color_red" msgid="4949354900304125428">"빨간색"</string>
+    <string name="color_green" msgid="5537717328428845841">"녹색"</string>
+    <string name="color_blue" msgid="7731984529016953223">"파란색"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"청록색"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"노란색"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"자홍색"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"작업 살펴보기"</string>
@@ -1391,7 +1413,7 @@
     <string name="disable_service_message" msgid="2012273739481042318">"확인을 터치하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"음성 안내 지원은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
@@ -1480,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"새로고침"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"미디어 서버"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"프로세스 통계"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"프로세스 실행에 관한 특이한 통계"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"메모리 사용량"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1513,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"다른 엔진 선택"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"이 음성 합성 엔진은 비밀번호와 신용카드 번호 등의 개인 데이터를 비롯한 모든 음성 데이터를 수집할 수 있습니다. 이것은 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 엔진의 기능입니다. 음성 합성 엔진을 사용하도록 설정하시겠습니까?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"이 언어로 TTS(Text-to-speech)를 출력하려면 네트워크 연결이 작동해야 합니다."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"음성 합성의 예입니다."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"기본 언어 상태"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 완전하게 지원됩니다."</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 네트워크 연결이 필요합니다."</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>은(는) 지원되지 않습니다."</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"확인 중..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"엔진"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 설정"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용"</string>
@@ -1549,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"끄는 중"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"블루투스"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"위치"</string>
     <string name="gadget_sync" msgid="858895763714222152">"동기화"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"밝기 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"자동"</string>
@@ -1733,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
     <string name="debug_layout" msgid="5981361776594526155">"레이아웃 범위 표시"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL 레이아웃 방향 강제 적용"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"모든 언어에 대해 화면 레이아웃 방향을 RTL로 강제 적용"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량 오버레이 표시"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU 렌더링 강제 설정"</string>
@@ -1925,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"탭앤페이"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"항상 확인"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"기본으로 설정하시겠습니까?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"제한사항"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"제한사항 삭제"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
@@ -1947,8 +1975,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"태블릿이 다른 기기와 접촉하면 데이터 교환 허용"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"휴대전화가 다른 기기와 접촉하면 데이터 교환 허용"</string>
-    <!-- no translation found for restriction_location_enable_title (5020268888245775164) -->
-    <skip />
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"위치"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"앱에서 위치 정보를 사용하도록 허용"</string>
     <string name="wizard_back" msgid="5567007959434765743">"뒤로"</string>
     <string name="wizard_next" msgid="3606212602795100640">"다음"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 362d349..702828e 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Vidutinis"</item>
     <item msgid="2372711992605524591">"Ilgas"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Numatytasis"</item>
+    <item msgid="1016452621833735880">"Be užraitų"</item>
+    <item msgid="2496277987934654454">"Be užraitų, glaustas"</item>
+    <item msgid="4406003087391086325">"Su užraitais"</item>
+    <item msgid="1558362802170124073">"Lygiaplotis"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Labai mažas"</item>
+    <item msgid="6781094565687692782">"Mažas"</item>
+    <item msgid="8222123259497646551">"Normalus"</item>
+    <item msgid="5813217276778560466">"Didelis"</item>
+    <item msgid="9044232017390975191">"Labai didelis"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Nėra"</item>
+    <item msgid="1352974708028506778">"Išdėstymas"</item>
+    <item msgid="5850876295428722675">"Viršuje esančio objekto šešėlis"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Juodas ant balto"</item>
+    <item msgid="1770533843436933500">"Baltas ant juodo"</item>
+    <item msgid="1309255027325660115">"Geltonas ant juodo"</item>
+    <item msgid="2985943780939258562">"Geltonas ant mėlyno"</item>
+    <item msgid="7520438652121629055">"Tinkintas"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Niekada neleisti"</item>
     <item msgid="1417929597727989746">"Visada leisti"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normali"</item>
+    <item msgid="4517779899383204000">"vidutiniška"</item>
+    <item msgid="406385694840950802">"prasta"</item>
+    <item msgid="4212263919458209842">"kritinė"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 785e14a..328739f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ar norite prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonų knygelės užklausa"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s nori pasiekti jūsų kontaktus ir skambučių istoriją. Suteikti prieigą %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Daugiau neklausti"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Daugiau neklausti"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Pranešimo užklausa"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s nori pasiekti jūsų pranešimus. Suteikti prieigą %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datos ir laiko nustatymai"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Pagal vietovę (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -988,13 +991,17 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Itin tikslu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
-    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Skirta tik įrengin. jutikliams"</string>
+    <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_category_location_services" msgid="7437150886946685979">"Vietovės nustatymo paslaugos"</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>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Nust. viet. naud. GPS, „Wi‑Fi“ ir mob. r. tink."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Nust. viet. naud. „Wi‑Fi“ ir mob. r. tink."</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Vietą nust. su GPS, „Wi‑Fi“ ir mob. tinklu"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Vietą nust. su „Wi‑Fi“ ir mob. tinklu"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Naudoti GPS vietovei nurodyti"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Nuskaitoma…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"„Wi-Fi“ ir mob. tinklo vietovė"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vietą nustatė „Wi-Fi“"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Patvirtinti išsaugotą modelį"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Bandykite dar kartą:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nubrėžti atrakinimo piešinį:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Jei norite gauti pagalbos, paspauskite „Meniu“."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Baigę atleiskite pirštą."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Prijunkite mažiausiai <xliff:g id="NUMBER">%d</xliff:g> taškus. Bandykite dar kartą:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Modelis įrašytas."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dar kartą nustatykite modelį, kad patvirtintumėte:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Naujas atrakinimo modelis:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Baigę atleiskite pirštą"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Sujunkite mažiausiai <xliff:g id="NUMBER">%d</xliff:g> tašk. Bandykite dar kartą."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Piešinys įrašytas"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Dar kartą nubrėžkite piešinį, kad patvirtintumėte"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Naujas atrakinimo piešinys"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Patvirtinti"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Nustatyti iš naujo"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Bandyti dar kartą"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bus iš naujo nustatytos visos toliau nurodytų objektų nuostatos:\n\n "<li>"Išjungtos programos"</li>\n" "<li>"Išjungtų programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų foninių duomenų apribojimai"</li>\n" "<li>"Visi leidimų apribojimai"</li>\n\n" Neprarasite jokių programų duomenų."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Iš naujo nustat. program."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
     <string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pasiekiamumo nustatymai"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Paslaugos"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Antraštės"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Didinimo gestai"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kai ši funkcija įjungta, galite artinti ir tolinti tris kartus palietę ekraną.\n\nKai priartinate, galite:\n"<ul><li>"Iš lėto apžvelgti: mažiausiai dviem pirštais vilkite ekranu."</li>\n<li>"Koreguoti priartinimo lygį: suimkite mažiausiai dviem pirštais arba išskėskite juos."</li></ul>\n\n"Be to, galite laikinai padidinti tai, kas po pirštu, tris kartus palietę ir laikydami. Esant šiai padidinto vaizdo būsenai galite vilkti pirštu, jei norite naršyti skirtingas ekrano dalis. Pakelkite pirštą, kad grįžtumėte į ankstesnę būseną.\n\nPastaba: palietimo tris kartus, kad būtų padidinta, funkcija veikia visur, išskyrus klaviatūrą ir naršymo juostą."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Spart. pritaikymo neįgal. įjungimas"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nustatymai"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Įjungta"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Išjungta"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Peržiūra"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standartinės parinktys"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Kalba"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Teksto dydis"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Antraštės stilius"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Tinkintos parinktys"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Fono spalva"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Fono nepermatomumas"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Teksto spalva"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Krašto spalva"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Krašto tipas"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Šriftų šeima"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Antraštės atrodys taip"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Numatytoji"</string>
+    <string name="color_none" msgid="3475640044925814795">"Nėra"</string>
+    <string name="color_white" msgid="8045195170201590239">"Balta"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Pilka"</string>
+    <string name="color_black" msgid="7517353520909872561">"Juoda"</string>
+    <string name="color_red" msgid="4949354900304125428">"Raudona"</string>
+    <string name="color_green" msgid="5537717328428845841">"Žalia"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Mėlyna"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Žalsvai mėlyna"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Geltona"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Purpurinė"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Stebėti jūsų veiksmus"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Atnaujinti"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"„Android“ OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesų statistika"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Entuziastų pateikta statistika apie vykstančius procesus"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Naudojama atmintis"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pasirinkite kitą variklį"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Šis kalbos sintezės variklis gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., kredito kortelės numerius, išskyrus slaptažodžius. Tai vyksta dėl variklio <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Įgalinti šio kalbos sintezės variklio naudojimą?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Pasirinkus šią kalbą, teksto vertimo kalba išvesčiai būtinas veikiantis tinklo ryšys."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Tai yra kalbos sintezės pavyzdys"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Numatytoji kalbos būsena"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> visiškai palaikoma"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> būtinas tinklo ryšys"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nepalaikoma"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Tikrinama..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Varikliai"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> nustatymai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> įgalinta"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"išjungiama"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Vietovė"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinchronizavimas"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Skaistis <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatinis"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rodyti išdėstymo ribas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Išdėst. iš dešin. į kairę"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nust. visų lokalių ekran. išdėst. iš deš. į kairę"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrano perdanga rodo dabartinį centr. proc. naud."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Priverst. GPU atvaizd."</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Paliesti ir mokėti"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Klausti kaskart"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nustatyti kaip jūsų nuostatą?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Apribojimai"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Pašalinti apribojimus"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 8798481..8fae0b6 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Vidējs"</item>
     <item msgid="2372711992605524591">"Ilgs"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Noklusējums"</item>
+    <item msgid="1016452621833735880">"Bezserifa"</item>
+    <item msgid="2496277987934654454">"Saspiests, bezserifa"</item>
+    <item msgid="4406003087391086325">"Serifa"</item>
+    <item msgid="1558362802170124073">"Vienplatuma"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Ļoti mazs"</item>
+    <item msgid="6781094565687692782">"Mazs"</item>
+    <item msgid="8222123259497646551">"Parasts"</item>
+    <item msgid="5813217276778560466">"Liels"</item>
+    <item msgid="9044232017390975191">"Ļoti liels"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Nav"</item>
+    <item msgid="1352974708028506778">"Kontūra"</item>
+    <item msgid="5850876295428722675">"Nolaižama ēna"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Melns uz balta"</item>
+    <item msgid="1770533843436933500">"Balts uz melna"</item>
+    <item msgid="1309255027325660115">"Dzeltens uz melna"</item>
+    <item msgid="2985943780939258562">"Dzeltens uz zila"</item>
+    <item msgid="7520438652121629055">"Pielāgots"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Neatļaut nekad"</item>
     <item msgid="1417929597727989746">"Vienmēr atļaut"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"parasts"</item>
+    <item msgid="4517779899383204000">"viduvējs"</item>
+    <item msgid="406385694840950802">"zems"</item>
+    <item msgid="4212263919458209842">"kritisks"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b134c14..a2797fc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vai vēlaties izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Tālruņu kataloga pieprasījums"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Ierīce %1$s vēlas piekļūt jūsu kontaktpersonām un zvanu vēsturei. Vai sniegt piekļuvi ierīcei %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nejautāt atkārtoti"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nejautāt atkārtoti"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Ziņojuma pieprasījums"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Ierīce “%1$s” vēlas piekļūt jūsu ziņojumiem. Vai sniegt piekļuvi ierīcei “%2$s”?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datuma un laika iestatījumi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Reģionāls (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Augsta precizitāte"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumulatora jaudas taupīšana"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tikai ierīces sensori"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Atrašanās vietu pakalpojumi"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Lietot GPS, Wi‑Fi un mob. tīklus vietas noteikšanai"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Lietot Wi‑Fi un mob. tīklus vietas noteikšanai"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Lietot GPS vietas noteikšanai"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Notiek izgūšana…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi un mob. tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks apkopoti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi noteikta atrašanās vieta"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mainīt atbloķēšanas PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Apstiprināt saglabāto kombināciju"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Mēģiniet vēlreiz:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Uzzīmējiet grafisko atslēgu:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zīmēt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Lai saņemtu palīdzību, nospiediet Izvēlne."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Atbrīvojiet pirkstu, kad esat pabeidzis."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pievienojiet vismaz <xliff:g id="NUMBER">%d</xliff:g> punktus. Mēģiniet vēlreiz:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Kombinācija ir ierakstīta."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vēlreiz zīmējiet kombināciju, lai apstiprinātu:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Jaunā atbloķēšanas kombinācija:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Atlaidiet pirkstu, kad esat pabeidzis."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Pievienojiet vismaz <xliff:g id="NUMBER">%d</xliff:g> punktus. Mēģiniet vēlreiz."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Kombinācija ir ierakstīta"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Vēlreiz zīmējiet kombināciju, lai apstiprinātu."</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Jaunā atbloķēšanas kombinācija"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Apstiprināt"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Uzvilkt atkārtoti"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Mēģināt vēlreiz"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tādējādi tiks atiestatītas visas preferences, kas saistītas ar:\n\n "<li>"atspējotām lietotnēm;"</li>\n" "<li>"atspējotu lietotņu paziņojumiem;"</li>\n" "<li>"darbībām paredzētām noklusējuma lietojumprogrammām;"</li>\n" "<li>"lietotņu fona datu ierobežojumiem;"</li>\n" "<li>"visiem atļauju ierobežojumiem."</li>\n\n" Jūs nezaudēsiet nekādus lietotņu datus."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Atiestatīt lietotnes"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pieejamības iestatījumi"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Pakalpojumi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Paraksti"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Palielināšanas žesti"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ja šī funkcija ir ieslēgta, varat tuvināt un tālināt, trīs reizes pieskaroties ekrānam.\n\nJa veicāt tuvināšanu, varat veikt arī tālāk norādītās darbības.\n"<ul><li>"Panoramēt — velciet divus pirkstus vai vairāk pāri ekrānam."</li>\n<li>"Pielāgot tālummaiņas līmeni — savelciet kopā divus pirkstus vai vairāk vai izpletiet tos."</li></ul>\n\n"Varat arī uz brīdi palielināt zem pirksta redzamo vienumu, trīs reizes pieskaroties ekrānam un turot. Šādā palielinājumā varat pārvilkt pirkstu, lai izvērstu citas ekrāna daļas. Paceliet pirkstu, lai atgrieztu iepriekšējo ekrāna stāvokli.\n\nPiezīme. Palielināšana, trīs reizes pieskaroties ekrānam, darbojas visos ekrānos, izņemot tastatūru un navigācijas joslu."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Iestatījumi"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ieslēgta"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izslēgta"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Priekšskatījums"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standarta opcijas"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Valoda"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Teksta lielums"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Paraksta stils"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Pielāgotas opcijas"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Fona krāsa"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Fona necaurredzamība"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Teksta krāsa"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Malu krāsa"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Malu veids"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Fontu saime"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Paraksti izskatīsies šādi:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Noklusējums"</string>
+    <string name="color_none" msgid="3475640044925814795">"Nav"</string>
+    <string name="color_white" msgid="8045195170201590239">"Balta"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Pelēka"</string>
+    <string name="color_black" msgid="7517353520909872561">"Melna"</string>
+    <string name="color_red" msgid="4949354900304125428">"Sarkana"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zaļa"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Zila"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Ciānzila"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Dzeltena"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Fuksīnsarkana"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Novērot jūsu darbības."</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Atsvaidzināt"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Procesu statistika"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistika par darbības procesiem"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Atmiņas lietojums"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izvēlēties citu programmu"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lietojot šo runas sintēzes programmu, var tikt apkopots viss ierunātais teksts, tostarp tāda personīgā informācija kā paroles un kredītkaršu numuri. Tā ir no <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> programmas. Vai iespējot šīs runas sintēzes programmas lietošanu?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Lai izmantotu teksta pārveidošanu runā šajā valodā, ir nepieciešams aktīvs tīkla savienojums."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Šis ir runas sintēzes piemērs."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Noklusējuma valodas statuss"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Lokalizācija <xliff:g id="LOCALE">%1$s</xliff:g> tiek pilnībā atbalstīta."</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Lokalizācijai <xliff:g id="LOCALE">%1$s</xliff:g> nepieciešams tīkla savienojums."</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Lokalizācija <xliff:g id="LOCALE">%1$s</xliff:g> netiek atbalstīta."</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Notiek pārbaude..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Programmas"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir iespējots"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"notiek izslēgšana"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Atrašanās vieta"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinhronizācija"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Spilgtums <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automātisks"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rādīt izkārtojuma robežas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Virz. no l. uz kr. (obl.)"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Obl. izkārt. virz. no labās uz kr. pusi visām lok."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrāna pārklājums ar aktuālo CPU lietojumu"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Piespiedu GPU render."</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Pieskarties un maksāt"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Jautāt katru reizi"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vai iestatīt kā jūsu preferenci?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ierobežojumi"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ierobežojumu atcelšana"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Mainīt PIN"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 36287ca..50e2391 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Sederhana"</item>
     <item msgid="2372711992605524591">"Panjang"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Lalai"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif diringkaskan"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Sangat kecil"</item>
+    <item msgid="6781094565687692782">"Kecil"</item>
+    <item msgid="8222123259497646551">"Biasa"</item>
+    <item msgid="5813217276778560466">"Besar"</item>
+    <item msgid="9044232017390975191">"Sangat besar"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Tiada"</item>
+    <item msgid="1352974708028506778">"Garis bentuk"</item>
+    <item msgid="5850876295428722675">"Huruf bayang"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Hitam pada putih"</item>
+    <item msgid="1770533843436933500">"Putih pada hitam"</item>
+    <item msgid="1309255027325660115">"Kuning pada hitam"</item>
+    <item msgid="2985943780939258562">"Kuning pada biru"</item>
+    <item msgid="7520438652121629055">"Peribadi"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Jangan benarkan"</item>
     <item msgid="1417929597727989746">"Sentiasa benarkan"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"biasa"</item>
+    <item msgid="4517779899383204000">"sederhana"</item>
+    <item msgid="406385694840950802">"rendah"</item>
+    <item msgid="4212263919458209842">"kritikal"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2d02167..8b1a568 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Permintaan buku telefon"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s mahu mengakses kenalan dan sejarah panggilan anda. Beri akses kepada %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Jangan tanya lagi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Jangan tanya lagi"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Permintaan mesej"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ingin mengakses mesej anda. Berikan akses kepada %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Wilayah (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -986,15 +989,20 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sila sambung ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ketepatan tinggi"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Kejituan tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Penjimatan bateri"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Penderia peranti sahaja"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</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_category_location_services" msgid="7437150886946685979">"Perkhidmatan lokasi"</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>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Guna GPS,  Wi-Fi &amp; rgkian mdh alih utk anggar lokasi"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Guna Wi-Fi &amp; rgkian mdh alih utk anggar lokasi"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Guna GPS utk mnntukn lokasi"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Anggar lokasi dgn GPS,  Wi-Fi"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Guna Wi-Fi untuk anggar lokasi"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Tentukan lokasi dengan GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Lokasi Wi-Fi &amp; rangkaian mudah alih"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi ditentukan oleh Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Tukar PIN buka kunci"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Sahkan corak yang disimpan"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Cuba lagi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Lukis corak buka kunci:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Lukis corak buka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk mendapatkan bantuan."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Alihkan jari apabila selesai."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambung sekurang-kurangnya <xliff:g id="NUMBER">%d</xliff:g> titik. Cuba lagi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Corak dirakam."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Lukis corak sekali lagi untuk mengesahkan:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Corak buka kunci baru anda:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Alihkan jari apabila selesai"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Sambung sekurang-kurangnya <xliff:g id="NUMBER">%d</xliff:g> titik. Cuba lagi."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Corak dirakam"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Lukis corak sekali lagi untuk mengesahkan"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Corak buka kunci baharu anda"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Sahkan"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Lukis semula"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Cuba semula"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ini akan menetapkan semula semua pilihan untuk:\n\n "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n" "<li>"Sebarang sekatan kebenaran"</li>\n\n" Anda tidak akan kehilangan apa-apa data apl."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tetapkan semula apl"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tetapan kebolehaksesan"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Kapsyen"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gerak isyarat pembesaran"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Apabila ciri ini dihidupkan, anda boleh mengezum masuk dan keluar dengan mengetik skrin tiga kali.\n\nSemasa dizum masuk, anda boleh:\n"<ul><li>"Menyorot: Seret menggunakan dua atau lebih jari merentasi skrin."</li>\n<li>"Melaraskan tahap zum: Rapatkan atau jarakkan dua atau lebih jari."</li></ul>\n\n"Anda juga boleh membesarkan item di bawah jari anda untuk sementara waktu dengan mengetik tiga kali dan menahannya. Dalam keadaan zum besar ini, anda boleh menyeret jari anda untuk meneroka bahagian-bahagian lain pada skrin. Angkat jari anda untuk kembali kepada keadaan sebelumnya.\n\nNota: Ketik tiga kali untuk pembesaran berfungsi di semua tempat kecuali pada papan kekunci dan bar navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehcapaian"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Tetapan"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Hidup"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Mati"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Pratonton"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Pilihan standard"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Bahasa"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Saiz teks"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Gaya kapsyen"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Pilihan tersuai"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Warna latar belakang"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Kelegapan latar belakang"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Warna teks"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Warna sisi"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Jenis sisi"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Keluarga fon"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Kapsyen akan kelihatan seperti ini"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Lalai"</string>
+    <string name="color_none" msgid="3475640044925814795">"Tiada"</string>
+    <string name="color_white" msgid="8045195170201590239">"Putih"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Kelabu"</string>
+    <string name="color_black" msgid="7517353520909872561">"Hitam"</string>
+    <string name="color_red" msgid="4949354900304125428">"Merah"</string>
+    <string name="color_green" msgid="5537717328428845841">"Hijau"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Biru"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Biru kehijauan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Kuning"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Perhatikan tindakan anda"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Muat semula"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Pelayan media"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistik Proses"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistik skema tentang proses yang sedang berjalan"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Penggunaan memori"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih enjin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Enjin sintesis pertuturan ini mungkin boleh mengumpul semua teks yang akan dituturkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada enjin <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Dayakan penggunaan enjin sintesis pertuturan ini?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini memerlukan sambungan rangkaian yang berfungsi untuk output teks-ke-tutur."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ini ialah contoh sintesis pertuturan."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status bahasa tetapan asal"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> disokong sepenuhnya"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> memerlukan sambungan rangkaian"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> tidak disokong"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Menyemak..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Enjin"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Tetapan <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> didayakan"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"mematikan"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokasi"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Segerakkan"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tunjukkan batas klip, margin dll."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah reka letak RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah reka letak skrin RTL bg semua tpt prstwa"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tunjukkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Ketik dan Bayar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Tanya setiap kali"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Jadikan sebagai pilihan anda?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Sekatan"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Alih keluar sekatan"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Tukar PIN"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index d38ddd2..87ecb24 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -279,7 +279,7 @@
     <item msgid="6700305533746877052">"bluetooth-volum"</item>
     <item msgid="2029227495214047094">"hold aktiv"</item>
     <item msgid="26109888160231211">"overvåk posisjon"</item>
-    <item msgid="5753382310468855812">"kontrollér posisjon for høyeffekt"</item>
+    <item msgid="5753382310468855812">"overvåk plassering med høyt strømforbruk"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sted"</item>
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Middels"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Standard"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Kondensert sans-serif"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Veldig liten"</item>
+    <item msgid="6781094565687692782">"Liten"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Stor"</item>
+    <item msgid="9044232017390975191">"Veldig stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ingen"</item>
+    <item msgid="1352974708028506778">"Omriss"</item>
+    <item msgid="5850876295428722675">"Bakgrunnsskygge"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Svart på hvitt"</item>
+    <item msgid="1770533843436933500">"Hvitt på svart"</item>
+    <item msgid="1309255027325660115">"Gult på svart"</item>
+    <item msgid="2985943780939258562">"Gult på blått"</item>
+    <item msgid="7520438652121629055">"Egendefinert"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Aldri tillat"</item>
     <item msgid="1417929597727989746">"Alltid tillat"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normalt"</item>
+    <item msgid="4517779899383204000">"moderat"</item>
+    <item msgid="406385694840950802">"lav"</item>
+    <item msgid="4212263919458209842">"svært viktig"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1c1f2d9..56d37fd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Forespørsel for telefonbok"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ønsker adgang til kontaktene og ringeloggen din. Vil du gi %2$s tilgang?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ikke spør igjen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ikke spør igjen"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Meldingsforespørsel"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ønsker adgang til meldingene dine. Vil du gi %2$s tilgang?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Innstillinger for dato og tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høy nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Bare enhetssensorer"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon deaktivert"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige stedsforespørsler"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Posisjonstjenester"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Bruk GPS, Wi-Fi og mobilnettverk til å anslå plassering"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Bruk Wi-Fi og mobilnettverk for å anslå plassering"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Bruk GPS for å finne posisjonen din"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Henter ..."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posisjon fastsatt av Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Endre PIN-kode for opplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv på nytt:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Tegn et opplåsingsmønster:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et opplåsingsmønster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Trykk menyknappen for hjelp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slipp fingeren når du er ferdig."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Tegn et mønster over minst <xliff:g id="NUMBER">%d</xliff:g> prikker. Prøv igjen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mønsteret er registrert."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Tegn mønsteret igjen for å bekrefte:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ditt nye opplåsingsmønster:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Slipp fingeren når du er ferdig."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Koble sammen minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv på nytt."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Mønsteret er registrert"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Tegn mønsteret på nytt for å bekrefte"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ditt nye opplåsingsmønster"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekreft"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Tegn på nytt"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Prøv igjen"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette tilbakestiller alle innstillinger for:\n\n"<li>"deaktiverte apper"</li>\n<li>"deaktiverte appvarsler"</li>\n<li>"standardapper for handlinger"</li>\n<li>"begrensninger for bakgrunnsdata for apper"</li>\n<li>"eventuelle tillatelsesbegrensninger"</li>\n\n" Du kommer ikke til å miste noe appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tilbakestill apper"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tilgjengelighetsinnstillinger"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Teksting"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Forstørrelsesbevegelser"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Når denne funksjonen er aktivert, kan du zoome inn og ut ved å trykke tre ganger på skjermen.\n\nNår du har zoomet inn kan du:\n"<ul><li>"Panorere: Dra to eller flere fingre over skjermen."</li>\n<li>"Tilpasse innzoomingen: Knip sammen eller spre fra hverandre to eller flere fingre."</li></ul>\n\n"Du kan også mildertidig forstørre det som er under fingeren din ved å trykke tre ganger og holde fingeren nede. Mens du forstørrer på denne måten kan du dra fingeren rundt for å se på forskjellige deler av skjermen. Løft fingeren din for å gå tilbake til den forrige visningen.\n\nMerk: Å trykke tre ganger for å forstørre fungerer overalt unntatt på tastaturet og navigasjonsraden."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Innstillinger"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Forhåndsvisning"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardvalg"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Språk"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tekststørrelse"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Tekstingstil"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Tilpassede alternativer"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Bakgrunnsfarge"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Bakgrunnsopasitet"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Tekstfarge"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Kantfarge"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Kant-type"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Skrifttype"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Tekstingen kommer til å se slik ut"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
+    <string name="color_white" msgid="8045195170201590239">"Hvit"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grå"</string>
+    <string name="color_black" msgid="7517353520909872561">"Svart"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rød"</string>
+    <string name="color_green" msgid="5537717328428845841">"Grønn"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blå"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> må:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observer handlingene dine"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Oppdater"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-operativsystem"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medietjener"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Prosess-statistikk"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Nerdete statistikk om prosesser som er i gang"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Minnebruk"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Velg en annen motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne talesyntesemotoren kan samle inn all uttalt tekst, herunder personlige opplysninger som for eksempel passord og kredittkortnumre. Den er basert på motoren <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Vil du aktivere bruk av denne talesyntesemotoren?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Dette språket krever en fungerende nettverkstilkobling for tekst-til-tale."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dette er et eksempel på talesyntese."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Standardspråkstatus"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> støttes fullt ut"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> krever nettverkstilkobling"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> støttes ikke"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerer ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Innstillinger for <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktivert"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"slår av"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Sted"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronisering"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis kantene i utformingen"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis kanter, marger osv."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving formgivningsretning for RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving RTL-formgivningsretning for skjermer"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skjermoverlegg viser gjeldende CPU-bruk"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving GPU-gjengivelse"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Berøringsbetaling"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Spør hver gang"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Angi som foretrukket?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begrensninger"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrensningene"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Endre PIN-koden"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 43e31a9..71528ba 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Normaal"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Standaard"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif versmald"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Zeer klein"</item>
+    <item msgid="6781094565687692782">"Klein"</item>
+    <item msgid="8222123259497646551">"Normaal"</item>
+    <item msgid="5813217276778560466">"Groot"</item>
+    <item msgid="9044232017390975191">"Zeer groot"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Geen"</item>
+    <item msgid="1352974708028506778">"Contour"</item>
+    <item msgid="5850876295428722675">"Slagschaduw"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Zwart op wit"</item>
+    <item msgid="1770533843436933500">"Wit op zwart"</item>
+    <item msgid="1309255027325660115">"Geel op zwart"</item>
+    <item msgid="2985943780939258562">"Geel op blauw"</item>
+    <item msgid="7520438652121629055">"Aangepast"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nooit toestaan"</item>
     <item msgid="1417929597727989746">"Altijd toestaan"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normaal"</item>
+    <item msgid="4517779899383204000">"gemiddeld"</item>
+    <item msgid="406385694840950802">"laag"</item>
+    <item msgid="4212263919458209842">"kritiek"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3d1e725..e47febf 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wilt u verbinding maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefoonboekverzoek"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s wil toegang tot uw contacten en oproepgeschiedenis. Toegang verlenen aan %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Niet meer vragen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Niet meer vragen"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Berichtverzoek"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s wil toegang tot uw berichten. Toegang geven aan %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tijdinstellingen"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Grote nauwkeurigheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Alleen apparaatsensoren"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locatie uit"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recente locatieverzoeken"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Locatieservices"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, wifi en mobiele netwerken gebruiken om locatie te schatten"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wifi en mobiele netwerken gebruiken om locatie te schatten"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS gebruiken om uw locatie te bepalen"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Ophalen…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wifi en mobiele netwerklocatie"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps toestaan de locatieservice van Google te gebruiken om uw locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locatie bepaald via wifi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer het opnieuw:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Teken een ontgrendelingspatroon:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken een ontgrendelingspatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk op \'Menu\' voor hulp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Haal uw vinger van het scherm als u klaar bent."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind minimaal <xliff:g id="NUMBER">%d</xliff:g> punten. Probeer het opnieuw:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Patroon opgenomen."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Teken patroon nogmaals ter bevestiging:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Uw nieuwe ontgrendelingspatroon:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Haal uw vinger van het scherm als u klaar bent"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbind minimaal <xliff:g id="NUMBER">%d</xliff:g> punten. Probeer het opnieuw."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Patroon opgenomen"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Teken patroon nogmaals ter bevestiging"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Uw nieuwe ontgrendelingspatroon"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bevestigen"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Opnieuw tekenen"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Opnieuw proberen"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hiermee worden alle voorkeuren opnieuw ingesteld voor:\n\n "<li>"Uitgeschakelde apps"</li>\n" "<li>"Uitgeschakelde app-meldingen"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens voor apps"</li>\n" "<li>"Beperkingen voor rechten"</li>\n\n" U verliest geen app-gegevens."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps herstellen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Ondertiteling"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrotingsgebaren"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wanneer deze functie is ingeschakeld, kunt u in- en uitzoomen door drie keer op het scherm te tikken.\n\nWanneer u bent ingezoomd, kunt u:\n"<ul><li>"Pannen: sleep twee of meer vingers over het scherm."</li>\n<li>"Zoomniveau aanpassen: knijp twee of meer vingers samen of spreid deze."</li></ul>\n\n"U kunt ook de inhoud onder uw vinger tijdelijk vergroten door drie keer te tikken en vast te houden. In deze vergrote staat kunt u slepen met uw vinger om verschillende gedeelten van het scherm te verkennen. Til uw vinger op om terug te keren naar de vorige staat.\n\nOpmerking: drie keer tikken voor vergroting werkt overal, behalve voor het toetsenbord en de navigatiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelkoppeling voor toegankelijkheid"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellingen"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Uit"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Voorbeeld"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standaardopties"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Taal"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tekengrootte"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Ondertitelstijl"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Aangepaste opties"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Achtergrondkleur"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Transparantie van achtergrond"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Tekstkleur"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Randkleur"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Randtype"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Lettertypefamilie"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Ondertiteling ziet er zo uit"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Standaard"</string>
+    <string name="color_none" msgid="3475640044925814795">"Geen"</string>
+    <string name="color_white" msgid="8045195170201590239">"Wit"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grijs"</string>
+    <string name="color_black" msgid="7517353520909872561">"Zwart"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rood"</string>
+    <string name="color_green" msgid="5537717328428845841">"Groen"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blauw"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyaanblauw"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Geel"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet het volgende kunnen:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Uw acties observeren"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Vernieuwen"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-besturingssysteem"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistieken"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistieken voor nerds over actieve processen"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Geheugengebruik"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Een andere engine kiezen"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Deze engine voor spraaksynthese kan mogelijk alle tekst verzamelen die wordt gesproken, waaronder persoonlijke gegevens zoals wachtwoorden en creditcardnummers. Deze engine is afkomstig van de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-engine. Het gebruik van deze engine voor spraaksynthese inschakelen?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Deze taal heeft een werkende netwerkverbinding nodig voor tekst-naar-spraak-uitvoer."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Dit is een voorbeeld van spraaksynthese"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status van standaardtaal"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> wordt volledig ondersteund"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> heeft een netwerkverbinding nodig"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> wordt niet ondersteund"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Controleren..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Instellingen voor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is ingeschakeld"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"uitschakelen"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Locatie"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisatie"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-sporen inschakelen"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Indelingsgrenzen weerg."</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clipgrenzen, marges en meer weergeven."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"V.r.n.l.-indelingsrichting afdwingen"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Schermindelingsrichting geforceerd instellen op V.r.n.l. voor alle talen"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-gebruik weergeven"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tikken en betalen"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Altijd vragen"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Instellen als uw voorkeur?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkingen"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Beperkingen verwijderen"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index c282648..09aa86e 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Średnie"</item>
     <item msgid="2372711992605524591">"Długie"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Domyślny"</item>
+    <item msgid="1016452621833735880">"Bezszeryfowy"</item>
+    <item msgid="2496277987934654454">"Bezszeryfowy wąski"</item>
+    <item msgid="4406003087391086325">"Szeryfowy"</item>
+    <item msgid="1558362802170124073">"Równej szerokości"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Bardzo mały"</item>
+    <item msgid="6781094565687692782">"Mały"</item>
+    <item msgid="8222123259497646551">"Normalny"</item>
+    <item msgid="5813217276778560466">"Duży"</item>
+    <item msgid="9044232017390975191">"Bardzo duży"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Brak"</item>
+    <item msgid="1352974708028506778">"Obrys"</item>
+    <item msgid="5850876295428722675">"Z cieniem"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Czarny na białym"</item>
+    <item msgid="1770533843436933500">"Biały na czarnym"</item>
+    <item msgid="1309255027325660115">"Żółty na czarnym"</item>
+    <item msgid="2985943780939258562">"Żółty na niebieskim"</item>
+    <item msgid="7520438652121629055">"Niestandardowy"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nigdy nie zezwalaj"</item>
     <item msgid="1417929597727989746">"Zawsze zezwalaj"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normalny poziom"</item>
+    <item msgid="4517779899383204000">"średni poziom"</item>
+    <item msgid="406385694840950802">"niski poziom"</item>
+    <item msgid="4212263919458209842">"poziom krytyczny"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1f23b3a..dd5d88f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Czy chcesz nawiązać połączenie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Żądanie dotyczące książki telefonicznej"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s chce uzyskać dostęp do Twoich kontaktów i historii połączeń. Zezwolić %2$s na dostęp?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nie pytaj ponownie"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nie pytaj ponownie"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Żądanie dostępu do wiadomości"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s chce uzyskać dostęp do Twoich wiadomości. Zezwolić na dostęp?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ustawienia daty i godziny"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regionalny (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Tylko czujniki urządzenia"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Usługi lokalizacyjne"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Dokładna lokalizacja przez GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Przez Wi-Fi i sieć komórkową"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokalizacja określona na podstawie Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmień kod PIN odblokowania"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Spróbuj ponownie:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Narysuj wzór odblokowania:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Narysuj wzór odblokowania"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Naciśnij Menu, aby uzyskać pomoc."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Puść palec, gdy gotowe."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Połącz co najmniej <xliff:g id="NUMBER">%d</xliff:g> kropki. Spróbuj jeszcze raz:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Wzór został nagrany."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Narysuj wzór ponownie, aby potwierdzić:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nowy wzór odblokowania:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Odsuń palec, gdy skończysz"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Połącz kropki (co najmniej <xliff:g id="NUMBER">%d</xliff:g>). Spróbuj ponownie."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Wzór zapisany"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Narysuj wzór ponownie, by potwierdzić"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Nowy wzór odblokowania"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potwierdź"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Narysuj ponownie"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Ponów próbę"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Zresetuje to wszystkie ustawienia:\n\n "<li>"wyłączonych aplikacji,"</li>\n" "<li>"powiadomień wyłączonych aplikacji,"</li>\n" "<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n" "<li>"ograniczeń danych w tle dla aplikacji,"</li>\n" "<li>"wszystkich ograniczeń uprawnień."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisy"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesty powiększania"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran.\n\nW trybie powiększenia możesz:\n"<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku.\n\nUwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ustawienia"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Wł."</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Wył."</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Podgląd"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opcje standardowe"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Język"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Rozmiar tekstu"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Styl napisów"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opcje niestandardowe"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Kolor tła"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Przezroczystość tła"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Kolor tekstu"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Kolor krawędzi"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Typ krawędzi"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Rodzina czcionek"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Napisy będą wyglądać tak"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Domyślnie"</string>
+    <string name="color_none" msgid="3475640044925814795">"Brak"</string>
+    <string name="color_white" msgid="8045195170201590239">"Biały"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Szary"</string>
+    <string name="color_black" msgid="7517353520909872561">"Czarny"</string>
+    <string name="color_red" msgid="4949354900304125428">"Czerwony"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zielony"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Niebieski"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyjan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Żółty"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Amarantowy"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Wymagania usługi <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwowanie Twoich działań"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Odśwież"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"System Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Użycie pamięci"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Wybierz inny mechanizm"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ten mechanizm syntezy mowy może gromadzić cały odczytywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Nazwa mechanizmu to <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Włączyć ten mechanizm syntezy mowy?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Do przetwarzania tekstu na mowę w tym języku wymagane jest działające połączenie sieciowe."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"To jest przykład syntezy mowy"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Stan domyślnego języka"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Język <xliff:g id="LOCALE">%1$s</xliff:g> jest w pełni obsługiwany"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Język <xliff:g id="LOCALE">%1$s</xliff:g> wymaga połączenia z siecią"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Język <xliff:g id="LOCALE">%1$s</xliff:g> nie jest obsługiwany"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Sprawdzam..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mechanizmy"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ustawienia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest włączony"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"wyłączanie"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokalizacja"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizacja"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Jasność <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatyczna"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Pokaż granice układu"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Wymuś układ od prawej do lewej"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Wymuś wszędzie układ ekranu od prawej do lewej"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Pokaż użycie procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Nakładka na ekranie pokazująca użycie procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Renderowanie na GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dotknij i zapłać"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Zawsze pytaj"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ustawić jako Twoją preferencję?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Usuń ograniczenia"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 0b362a6..c7f8b10 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Média"</item>
     <item msgid="2372711992605524591">"Longa"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predefinição"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensado"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monoespaço"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Muito pequeno"</item>
+    <item msgid="6781094565687692782">"Pequeno"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Grande"</item>
+    <item msgid="9044232017390975191">"Muito grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Nenhum"</item>
+    <item msgid="1352974708028506778">"Contorno"</item>
+    <item msgid="5850876295428722675">"Sombra projetada"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Preto em branco"</item>
+    <item msgid="1770533843436933500">"Branco em preto"</item>
+    <item msgid="1309255027325660115">"Amarelo em preto"</item>
+    <item msgid="2985943780939258562">"Amarelo em azul"</item>
+    <item msgid="7520438652121629055">"Personalizado"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -381,12 +413,12 @@
   <string-array name="overlay_display_devices_entries">
     <item msgid="1606809880904982133">"Nenhuma"</item>
     <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="6027541158956821790">"720x480 mdpi (protegido)"</item>
-    <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
-    <item msgid="2920655562462493148">"1280x720 tvdpi (protegido)"</item>
-    <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
-    <item msgid="4171600481380800455">"1920x1080 xhdpi (protegido)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi e 1920x1080 xhdpi"</item>
+    <item msgid="6027541158956821790">"720 x 480 mdpi (protegido)"</item>
+    <item msgid="8181151155909301030">"1280 x 720 tvdpi"</item>
+    <item msgid="2920655562462493148">"1280 x 720 tvdpi (protegido)"</item>
+    <item msgid="8910371271391940941">"1920 x 1080 xhdpi"</item>
+    <item msgid="4171600481380800455">"1920 x 1080 xhdpi (protegido)"</item>
+    <item msgid="1937752114395156918">"1280 x 720 tvdpi e 1920 x 1080 xhdpi"</item>
   </string-array>
   <string-array name="enable_opengl_traces_entries">
     <item msgid="3191973083884253830">"Nada"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nunca permitir"</item>
     <item msgid="1417929597727989746">"Permitir sempre"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderada"</item>
+    <item msgid="406385694840950802">"baixa"</item>
+    <item msgid="4212263919458209842">"crítica"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fb0bf6d..7fc208a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Pretende ligar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação de lista telefónica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s pretende aceder aos seus contactos e histórico de chamadas. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Pedido de mensagem"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s pretende aceder às suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Definições de data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Poupança de bateria"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Apenas sensores do dispositivo"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pedidos de local. recentes"</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_category_location_services" msgid="7437150886946685979">"Serviços de localizaçã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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utilizar redes móveis, Wi-Fi e GPS p/ calcular a local."</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utilizar redes móveis e Wi-Fi p/ calcular a local."</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utilizar GPS p/ ident. local."</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenhar uma sequência de desbloqueio:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Prima Menu para obter ajuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Retirar dedo quando concluído."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ligue pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Sequência gravada."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenhe novamente o padrão para confirmar:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"O seu novo padrão de desbloqueio:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Retirar dedo quando concluído"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Ligue pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Sequência gravada"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Desenhe novamente a sequência para confirmar"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"A sua sequência de desbloqueio nova"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Redesenhar"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Tentar novamente"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isto irá repor todas as preferências de:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n" "<li>"Todas as restrições de autorização"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliação"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando esta funcionalidade está ativada, pode aumentar ou diminuir o zoom ao tocar três vezes no ecrã.\n\nEnquanto estiver a aumentar o zoom, pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos no ecrã."</li>\n<li>"Ajustar o nível de zoom: junte dois ou mais dedos ou afaste-os."</li></ul>\n\n"Também pode aumentar temporariamente o que estiver por baixo do seu dedo ao tocar três vezes sem soltar. Neste estado aumentado, pode arrastar o dedo para explorar diferentes partes do ecrã. Levante o dedo para voltar ao estado anterior.\n\nNota: O toque triplo para aumentar funciona em todo o lado, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Pré-visualizar"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opções padrão"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tamanho do texto"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Estilo das legendas"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opções personalizadas"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Cor de fundo"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacidade do fundo"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Cor do texto"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Cor do limite"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipo de limite"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Família de tipos de letra"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"As legendas terão este aspeto"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predefinição"</string>
+    <string name="color_none" msgid="3475640044925814795">"Nenhuma"</string>
+    <string name="color_white" msgid="8045195170201590239">"Branco"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Cinzento"</string>
+    <string name="color_black" msgid="7517353520909872561">"Preto"</string>
+    <string name="color_red" msgid="4949354900304125428">"Vermelho"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Azul"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Azul-turquesa"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar as suas ações"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas do Processo"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas de peritos acerca dos processos em execução"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Utilização da memória"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Escolher outro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este motor de síntese de discurso pode permitir a recolha de todo o texto que será falado, incluindo dados pessoais, como palavras-passe e números de cartão de crédito. O serviço é fornecido com o motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permitir a utilização deste motor de síntese de discurso?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma ligação de rede ativa para uma saída de síntese de voz."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Exemplo de síntese de voz."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Estado do idioma predefinido"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportado"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> necessita de ligação de rede"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportado"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"A verificar..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Definições de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está ativado"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"a desligar"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Localização"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limit. do esquema"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. do esq. RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"For. dir. do esq. do ecrã p. RTL em tds os locais"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobrep. de ecrã que mostra a utiliz. atual da CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar composição GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar e Pagar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 64667b6..e32041e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Médio"</item>
     <item msgid="2372711992605524591">"Longo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Padrão"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensado"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Espaçamento uniforme"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Muito pequeno"</item>
+    <item msgid="6781094565687692782">"Pequeno"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Grande"</item>
+    <item msgid="9044232017390975191">"Muito grande"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Nenhum"</item>
+    <item msgid="1352974708028506778">"Contorno"</item>
+    <item msgid="5850876295428722675">"Sombra"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Preto em branco"</item>
+    <item msgid="1770533843436933500">"Branco em preto"</item>
+    <item msgid="1309255027325660115">"Amarelo em preto"</item>
+    <item msgid="2985943780939258562">"Amarelo em azul"</item>
+    <item msgid="7520438652121629055">"Personalizado"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nunca permitir"</item>
     <item msgid="1417929597727989746">"Sempre permitir"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"moderado"</item>
+    <item msgid="406385694840950802">"baixo"</item>
+    <item msgid="4212263919458209842">"crítico"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ca425c..074fe3c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Deseja conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitação da lista telefônica"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s deseja acessar seus contatos e o histórico de chamadas. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Não perguntar novamente"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Solicitação de mensagem"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"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_category_location_services" msgid="7437150886946685979">"Serviços de localização"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Usar GPS, Wi‑Fi e redes móveis p/ estimar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Usar Wi‑Fi e redes móveis p/ estimar a localização"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Usar GPS p/ determinar o local"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Local de rede móvel e Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que os aplicativos usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenhar um padrão de desbloqueio:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhe um padrão de desbloqueio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pressione Menu para obter ajuda."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solte o dedo quando terminar."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar no mínimo <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Padrão registrado."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenhe o padrão novamente para confirmar:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Seu novo padrão de desbloqueio:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Levante o dedo ao terminar"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Conecte pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Padrão registrado"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Desenhe o padrão novamente para confirmar"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Seu novo padrão de desbloqueio"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Desenhar novamente"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Tentar novamente"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para: \n \n "<li>"aplicativos desabilitados "</li>" \n "<li>" notificações de aplicativos desabilitados "</li>" \n "<li>" aplicativos padrão para ações "</li>" \n "<li>" restrições de dados em plano de fundo para aplicativos "</li>" \n "<li>" quaisquer restrições de permissão "</li>" \n \n você não perderá dados de aplicativos."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir aplicativos"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliação"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando este recurso está ativado, você pode aumentar e diminuir o zoom com um toque triplo na tela.\n\nQuando o zoom é aplicado, você pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos pela tela."</li>\n<li>"Ajustar o nível de zoom: use o gesto de pinçagem ou expanda usando dois ou mais dedos."</li></ul>\n\n"Você também pode ampliar temporariamente o que estiver sob seu dedo dando um toque triplo e segurando. No estado ampliado, arraste o dedo para explorar as diferentes partes da tela. Levante o dedo para voltar ao estado anterior.\n\nObservação: o toque triplo para ampliar funciona em qualquer parte da tela, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Visualização"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opções padrão"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Tamanho do texto"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Estilo da legenda"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opções de personalização"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Cor do plano de fundo"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacidade do plano de fundo"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Cor do texto"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Cor da borda"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipo de borda"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Família de fontes"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"As legendas ficarão assim"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Padrão"</string>
+    <string name="color_none" msgid="3475640044925814795">"Nenhum"</string>
+    <string name="color_white" msgid="8045195170201590239">"Branco"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Cinza"</string>
+    <string name="color_black" msgid="7517353520909872561">"Preto"</string>
+    <string name="color_red" msgid="4949354900304125428">"Vermelho"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Azul"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Ciano"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Amarelo"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar suas ações"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional do Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Estatísticas do processo"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Estatísticas detalhadas sobre os processos em execução"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Uso da memória"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecione outro mecanismo"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este mecanismo de síntese de fala pode coletar todo texto que será falado, inclusive dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do mecanismo <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Deseja ativar o uso desse mecanismo de síntese de fala?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma conexão de rede ativa para a conversão de texto em voz."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Este é um exemplo de sintetização de voz."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status de idioma padrão"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> é totalmente suportada"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> requer conexão de rede"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> não é suportada"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Verificando…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mecanismos"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi ativado"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desativando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Localização"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronização"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar rastream. OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limites de layout"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar limites de corte, margens, etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. layout (RTL)"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forçar direção do layout (RTL) p/ todas as local."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar o uso da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobreposição de tela que mostra o uso da CPU atual"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar renderização GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Tocar e pagar"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Perguntar sempre"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Definir como preferência?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 3889f4a..28c82da 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -249,6 +249,28 @@
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for captioning_typeface_selector_titles:0 (1319652728542138112) -->
+    <!-- no translation found for captioning_typeface_selector_titles:1 (1016452621833735880) -->
+    <!-- no translation found for captioning_typeface_selector_titles:2 (2496277987934654454) -->
+    <!-- no translation found for captioning_typeface_selector_titles:3 (4406003087391086325) -->
+    <!-- no translation found for captioning_typeface_selector_titles:4 (1558362802170124073) -->
+    <!-- no translation found for captioning_font_size_selector_titles:0 (4800919809575254054) -->
+    <!-- no translation found for captioning_font_size_selector_titles:1 (6781094565687692782) -->
+    <!-- no translation found for captioning_font_size_selector_titles:2 (8222123259497646551) -->
+    <!-- no translation found for captioning_font_size_selector_titles:3 (5813217276778560466) -->
+    <!-- no translation found for captioning_font_size_selector_titles:4 (9044232017390975191) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:0 (6022616153255438487) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:1 (1352974708028506778) -->
+    <!-- no translation found for captioning_edge_type_selector_titles:2 (5850876295428722675) -->
+    <!-- no translation found for captioning_opacity_selector_titles:0 (7622491218136667566) -->
+    <!-- no translation found for captioning_opacity_selector_titles:1 (2367156416247936773) -->
+    <!-- no translation found for captioning_opacity_selector_titles:2 (5395560410107149298) -->
+    <!-- no translation found for captioning_opacity_selector_titles:3 (8342334626783983353) -->
+    <!-- no translation found for captioning_preset_selector_titles:0 (4449370095159630210) -->
+    <!-- no translation found for captioning_preset_selector_titles:1 (1770533843436933500) -->
+    <!-- no translation found for captioning_preset_selector_titles:2 (1309255027325660115) -->
+    <!-- no translation found for captioning_preset_selector_titles:3 (2985943780939258562) -->
+    <!-- no translation found for captioning_preset_selector_titles:4 (7520438652121629055) -->
     <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
     <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
     <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
@@ -325,4 +347,8 @@
     <!-- no translation found for security_settings_premium_sms_values:0 (7389829271787670252) -->
     <!-- no translation found for security_settings_premium_sms_values:1 (5077768429488260031) -->
     <!-- no translation found for security_settings_premium_sms_values:2 (1417929597727989746) -->
+    <!-- no translation found for ram_states:0 (7088762389498381203) -->
+    <!-- no translation found for ram_states:1 (4517779899383204000) -->
+    <!-- no translation found for ram_states:2 (406385694840950802) -->
+    <!-- no translation found for ram_states:3 (4212263919458209842) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 435b2b3..bec533b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -226,8 +226,14 @@
     <skip />
     <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
     <skip />
+    <!-- no translation found for bluetooth_remember_choice (6198284561603824931) -->
+    <skip />
     <!-- no translation found for bluetooth_pb_remember_choice (2901499974259177202) -->
     <skip />
+    <!-- no translation found for bluetooth_map_request (1541931183213124878) -->
+    <skip />
+    <!-- no translation found for bluetooth_map_acceptance_dialog_text (8712508202081143737) -->
+    <skip />
     <string name="date_and_time" msgid="4114084177056654663">"Parameters da data e da temp"</string>
     <!-- no translation found for choose_timezone (1362834506479536274) -->
     <skip />
@@ -1517,10 +1523,16 @@
     <skip />
     <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
     <skip />
+    <!-- no translation found for location_mode_location_off_title (2829713015012529465) -->
+    <skip />
     <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
     <skip />
     <!-- no translation found for location_category_location_services (7437150886946685979) -->
     <skip />
+    <!-- no translation found for location_high_battery_use (517199943258508020) -->
+    <skip />
+    <!-- no translation found for location_low_battery_use (8602232529541903596) -->
+    <skip />
     <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
     <skip />
     <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
@@ -1529,6 +1541,8 @@
     <skip />
     <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
     <skip />
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <!-- no translation found for location_network_based (9134175479520582215) -->
     <skip />
     <!-- no translation found for location_neighborhood_level (5626515380188353712) -->
@@ -1596,15 +1610,18 @@
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confermar il schema memorisà"</string>
     <!-- no translation found for lockpattern_need_to_unlock_wrong (4694973540770105678) -->
     <skip />
-    <!-- no translation found for lockpattern_recording_intro_header (2063630508212535241) -->
-    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dissegnai in schema da debloccaziun:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Smatgar sin Menu per mussar l\'agid."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Prender davent il det sche Vus avais terminà."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Colliai almain <xliff:g id="NUMBER">%d</xliff:g> puncts. Empruvai anc ina giada:"</string>
-    <!-- no translation found for lockpattern_pattern_entered_header (8378617839439987962) -->
+    <!-- no translation found for lockpattern_recording_inprogress (6667844062721656773) -->
     <skip />
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dissegnai danovamain il schema per confermar:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Voss nov schema da debloccaziun:"</string>
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (1348234155120957561) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (4316818983675591604) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (8054853451639221265) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (8455614172231880211) -->
+    <skip />
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confermar"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Registrar da nov"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Empruvar danovamain"</string>
@@ -2095,6 +2112,8 @@
     <skip />
     <!-- no translation found for accessibility_system_title (7187919089874130484) -->
     <skip />
+    <!-- no translation found for accessibility_captioning_title (7589266662024836291) -->
+    <skip />
     <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
     <skip />
     <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
@@ -2127,6 +2146,56 @@
     <skip />
     <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
     <skip />
+    <!-- no translation found for captioning_preview_title (1234015253497016890) -->
+    <skip />
+    <!-- no translation found for captioning_standard_options_title (3284211791180335844) -->
+    <skip />
+    <!-- no translation found for captioning_locale (4559155661018823503) -->
+    <skip />
+    <!-- no translation found for captioning_text_size (6737002449104466028) -->
+    <skip />
+    <!-- no translation found for captioning_preset (8939737196538429044) -->
+    <skip />
+    <!-- no translation found for captioning_custom_options_title (5067500939930322405) -->
+    <skip />
+    <!-- no translation found for captioning_background_color (9053011212948992570) -->
+    <skip />
+    <!-- no translation found for captioning_background_opacity (6029993616419971202) -->
+    <skip />
+    <!-- no translation found for captioning_foreground_color (85623486537640059) -->
+    <skip />
+    <!-- no translation found for captioning_edge_color (3670094753735263238) -->
+    <skip />
+    <!-- no translation found for captioning_edge_type (5997247394951682154) -->
+    <skip />
+    <!-- no translation found for captioning_typeface (1826169240566563259) -->
+    <skip />
+    <!-- no translation found for captioning_preview_text (4067935959797375065) -->
+    <skip />
+    <!-- no translation found for captioning_preview_characters (7105909138497851769) -->
+    <skip />
+    <!-- no translation found for locale_default (2593883646136326969) -->
+    <skip />
+    <!-- no translation found for color_none (3475640044925814795) -->
+    <skip />
+    <!-- no translation found for color_white (8045195170201590239) -->
+    <skip />
+    <!-- no translation found for color_gray (9192312087142726313) -->
+    <skip />
+    <!-- no translation found for color_black (7517353520909872561) -->
+    <skip />
+    <!-- no translation found for color_red (4949354900304125428) -->
+    <skip />
+    <!-- no translation found for color_green (5537717328428845841) -->
+    <skip />
+    <!-- no translation found for color_blue (7731984529016953223) -->
+    <skip />
+    <!-- no translation found for color_cyan (7033027180641173211) -->
+    <skip />
+    <!-- no translation found for color_yellow (9112680561610873529) -->
+    <skip />
+    <!-- no translation found for color_magenta (5059212823607815549) -->
+    <skip />
     <!-- no translation found for enable_service_title (3061307612673835592) -->
     <skip />
     <!-- no translation found for capabilities_list_title (86713361724771971) -->
@@ -2278,6 +2347,16 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualisar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistem operativ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Server multimedia"</string>
+    <!-- no translation found for process_stats_summary_title (1144688045609771677) -->
+    <skip />
+    <!-- no translation found for process_stats_summary (109387941605607762) -->
+    <skip />
+    <!-- no translation found for app_memory_use (7849258480392171939) -->
+    <skip />
+    <!-- no translation found for process_stats_total_duration (663196332079061529) -->
+    <skip />
+    <!-- no translation found for process_stats_memory_status (4251599550196193093) -->
+    <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>
@@ -2330,6 +2409,8 @@
     <skip />
     <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
     <skip />
+    <!-- no translation found for tts_status_checking (4983413982985913047) -->
+    <skip />
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduls"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Parameters <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è activà."</string>
@@ -2371,7 +2452,7 @@
     <skip />
     <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
     <skip />
-    <!-- no translation found for gadget_gps (1558173602059236567) -->
+    <!-- no translation found for gadget_location (2974757497945178165) -->
     <skip />
     <!-- no translation found for gadget_sync (858895763714222152) -->
     <skip />
@@ -2714,6 +2795,10 @@
     <skip />
     <!-- no translation found for debug_layout_summary (2001775315258637682) -->
     <skip />
+    <!-- no translation found for force_rtl_layout_all_locales (2259906643093138978) -->
+    <skip />
+    <!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
+    <skip />
     <!-- no translation found for show_cpu_usage (2389212910758076024) -->
     <skip />
     <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
@@ -3097,6 +3182,12 @@
     <skip />
     <!-- no translation found for global_font_change_title (1887126466191012035) -->
     <skip />
+    <!-- no translation found for nfc_payment_settings_title (4226098386809754689) -->
+    <skip />
+    <!-- no translation found for nfc_payment_ask (1061129391464251903) -->
+    <skip />
+    <!-- no translation found for nfc_payment_set_default (1583397933053078296) -->
+    <skip />
     <!-- no translation found for restriction_settings_title (4233515503765879736) -->
     <skip />
     <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index e2e3d0f..d057fd2 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Medie"</item>
     <item msgid="2372711992605524591">"Lungă"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Prestabilit"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif condensat"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Cu un singur spațiu"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Foarte mic"</item>
+    <item msgid="6781094565687692782">"Mic"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Mare"</item>
+    <item msgid="9044232017390975191">"Foarte mare"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Niciunul"</item>
+    <item msgid="1352974708028506778">"Contur"</item>
+    <item msgid="5850876295428722675">"Umbră"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Negru pe alb"</item>
+    <item msgid="1770533843436933500">"Alb pe negru"</item>
+    <item msgid="1309255027325660115">"Galben pe negru"</item>
+    <item msgid="2985943780939258562">"Galben pe albastru"</item>
+    <item msgid="7520438652121629055">"Personalizat"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nu permiteţi niciodată"</item>
     <item msgid="1417929597727989746">"Permiteţi întotdeauna"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normală"</item>
+    <item msgid="4517779899383204000">"medie"</item>
+    <item msgid="406385694840950802">"redusă"</item>
+    <item msgid="4212263919458209842">"critică"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a6030cf..1854651 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriţi să vă conectaţi la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Solicitare de agendă"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s doreşte să acceseze Agenda dvs. şi istoricul apelurilor. Permiteţi accesul pentru %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nu doresc să fiu întrebat(ă) din nou"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nu doresc să fiu întrebat(ă) din nou"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Cerere mesaj"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s dorește să acceseze mesajele dvs. Oferiți acces pentru %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setări privind data şi ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectaţi fusul orar"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Regional (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -311,8 +314,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. utilizator"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afișați informații profil la blocarea ecranului"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informații profil"</string>
-    <!-- no translation found for location_settings_title (1369675479310751735) -->
-    <skip />
+    <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
@@ -986,25 +988,20 @@
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
-    <!-- no translation found for location_mode_title (3982009713118421689) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_title (8241802585110932849) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_title (711273645208158637) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_title (5960338820984635411) -->
-    <skip />
-    <!-- no translation found for location_category_recent_location_requests (1938721350424447421) -->
-    <skip />
-    <!-- no translation found for location_category_location_services (7437150886946685979) -->
-    <skip />
-    <!-- no translation found for location_mode_screen_title (4528716772270246542) -->
-    <skip />
-    <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
-    <skip />
-    <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
-    <skip />
-    <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
+    <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
+    <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Numai senzorii dispozitivului"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Servicii de localizare"</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>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Utiliz. rețele Wi-Fi și mobile pt. locația aprox."</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Utiliz. rețele Wi-Fi și mobile pt. locația aprox."</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Utiliz. GPS pt. a indica loc. dvs"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
     <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplicaţiile estimează mai rapid locaţia cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
@@ -1053,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Schimbaţi codul PIN de deblocare"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmaţi modelul salvat"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Încercaţi din nou:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenați un model pentru deblocare:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenaţi un model pentru deblocare"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Apăsaţi pe Meniu pentru ajutor."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ridicaţi degetul când aţi terminat."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectaţi minimum <xliff:g id="NUMBER">%d</xliff:g> (de) puncte. Încercaţi din nou:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Model înregistrat."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Desenaţi din nou modelul pentru a confirma:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Noul dvs. model pentru deblocare:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ridicaţi degetul când aţi terminat"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Conectaţi cel puțin <xliff:g id="NUMBER">%d</xliff:g> puncte. Încercaţi din nou."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Model înregistrat"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Desenaţi din nou modelul pentru a confirma"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Noul dvs. model pentru deblocare"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Confirmaţi"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Redesenare"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Încercaţi din nou"</string>
@@ -1127,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați pref. aplicații"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetaţi pref. aplicații?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Aceasta va reseta toate preferințele pentru:\n\n "<li>"aplicații dezactivate;"</li>\n" "<li>"notificări de aplicații dezactivate;"</li>\n" "<li>"aplicații prestabilite pentru acțiuni;"</li>\n" "<li>"restricții privind datele de fundal pentru aplicații;"</li>\n" "<li>"orice restricții de permisiuni."</li>\n\n" Nu veți pierde datele aplicațiilor."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicaţiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionaţi spaţiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
@@ -1368,6 +1364,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setări de accesibilitate"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul.\n\nÎn timp ce măriţi, puteţi:\n"<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În această stare mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
@@ -1384,6 +1381,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setări"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activată"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Dezactivată"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Previzualizați"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opțiuni standard"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Limbă"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Dimensiunea textului"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Stilul subtitrării"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Opțiuni personalizate"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Culoare de fundal"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacitatea fundalului"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Culoarea textului"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Culoarea marginii"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Tipul marginii"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Familie de fonturi"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Subtitrările vor arăta așa"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Prestabilit"</string>
+    <string name="color_none" msgid="3475640044925814795">"Niciuna"</string>
+    <string name="color_white" msgid="8045195170201590239">"Alb"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gri"</string>
+    <string name="color_black" msgid="7517353520909872561">"Negru"</string>
+    <string name="color_red" msgid="4949354900304125428">"Roșu"</string>
+    <string name="color_green" msgid="5537717328428845841">"Verde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Albastru"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Galben"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> trebuie să:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Remarcă acțiunile dvs."</string>
@@ -1481,6 +1503,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizaţi"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistem de operare Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Server media"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistici de proces"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistici inteligente despre procesele care rulează"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Utilizarea memoriei"</string>
+    <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="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>
@@ -1514,16 +1541,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Alegeţi alt motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele şi numerele cărţilor de credit. Metoda provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Pentru rezultatul transformării textului în vorbire pentru această limbă este necesară o conexiune de reţea care să funcţioneze."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Acesta este un exemplu de sintetizare a vorbirii"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Starea limbii prestabilite"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> este acceptată integral"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> necesită conexiune la rețea"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> nu este acceptată"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Se verifică..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motoare"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Setări <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este activat"</string>
@@ -1550,7 +1573,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"se dezactivează"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Locație"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizaţi"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Luminozitate <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automată"</string>
@@ -1734,6 +1757,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Direcție aspect dr. - st."</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direcție obligatorie aspect ecran dreapta - stânga"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
@@ -1926,6 +1951,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Atingeți și plătiți"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Întreabă de fiecare dată"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setați ca preferință?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restricții"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminați restricțiile"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Schimbați codul PIN"</string>
@@ -1948,8 +1976,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permiteți schimbul de date atunci când tableta atinge alt dispozitiv"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permiteți schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
-    <!-- no translation found for restriction_location_enable_title (5020268888245775164) -->
-    <skip />
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"Locație"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permiteți ca aplicațiile să utilizeze informațiile despre locație"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Înapoi"</string>
     <string name="wizard_next" msgid="3606212602795100640">"Înainte"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 9745d90..cc2fd98 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Средняя"</item>
     <item msgid="2372711992605524591">"Большая"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"По умолчанию"</item>
+    <item msgid="1016452621833735880">"Без засечек"</item>
+    <item msgid="2496277987934654454">"Без засечек, сжатый"</item>
+    <item msgid="4406003087391086325">"С засечками"</item>
+    <item msgid="1558362802170124073">"Моноширинный"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Очень мелкий"</item>
+    <item msgid="6781094565687692782">"Мелкий"</item>
+    <item msgid="8222123259497646551">"Средний"</item>
+    <item msgid="5813217276778560466">"Крупный"</item>
+    <item msgid="9044232017390975191">"Очень крупный"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Нет"</item>
+    <item msgid="1352974708028506778">"Контур"</item>
+    <item msgid="5850876295428722675">"С тенью"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Черный на белом"</item>
+    <item msgid="1770533843436933500">"Белый на черном"</item>
+    <item msgid="1309255027325660115">"Желтый на черном"</item>
+    <item msgid="2985943780939258562">"Желтый на синем"</item>
+    <item msgid="7520438652121629055">"Пользовательский"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Не разрешать"</item>
     <item msgid="1417929597727989746">"Разрешать всегда"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"высокий"</item>
+    <item msgid="4517779899383204000">"средний"</item>
+    <item msgid="406385694840950802">"низкий"</item>
+    <item msgid="4212263919458209842">"очень низкий"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 110fe46..e2efd0f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запрос телефонной книги"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Устройство \"%1$s\" пытается получить доступ к вашим контактам и журналу вызовов. Разрешить доступ для %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Больше не спрашивать"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Больше не спрашивать"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Запрос на доступ к сообщениям"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хочет получить доступ к вашим сообщениям. Предоставить доступ %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"По умолчанию (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Высокая точность"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Сокращение энергопотребления"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Только сенсоры устройства"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Отправка геоданных отключена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последние запросы места"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Мое местоположение"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Для определения местоположения используются GPS, Wi‑Fi и мобильные сети"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Для определения местоположения используются Wi‑Fi и мобильные сети"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Для определения местоположения используется GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить PIN-код"</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="2063630508212535241">"Начертите ключ разблокировки"</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="4622772178078818425">"По завершении отпустите палец"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините не менее <xliff:g id="NUMBER">%d</xliff:g> точек"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Начертите ключ еще раз"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый ключ разблокировки"</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_confirm_button_text" msgid="1128204343957002841">"Подтвердить"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Воспроизвести повторно"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кэше"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Будут сброшены следующие настройки:\n\n"<li>"список отключенных приложений;"</li>\n<li>"уведомления для отключенных приложений;"</li>\n<li>"список приложений по умолчанию;"</li>\n<li>"ограничения на передачу данных в фоновом режиме;"</li>\n<li>"ограничения на разрешения."</li>\n\n"Данные приложений удалены не будут."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Да"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки специальных возможностей"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Титры"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жесты для увеличения"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Эта функция позволяет увеличивать и уменьшать изображение, трижды нажав на экран.\n\nПри увеличенном масштабе можно:\n"<ul><li>"панорамировать – проведите пальцами по экрану;"</li>\n<li>"изменять масштаб – сведите или разведите пальцы."</li></ul>\n\n"Чтобы временно увеличить изображение под пальцем, трижды нажмите на экран и удерживайте его. Проведя пальцем, вы можете посмотреть на другие области экрана. Чтобы вернуть экран в прежнее состояние, уберите палец.\n\nПримечание. Тройным нажатием увеличиваются все области, кроме клавиатуры и панели навигации."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Включено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Выключено"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Предварительный просмотр"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Стандартные параметры"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Язык"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Размер текста"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Стиль титров"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Персонализированные параметры"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Цвет фона"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Прозрачность фона"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Цвет текста"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Цвет краев"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Тип краев"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Шрифт"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Титры будут выглядеть так"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
+    <string name="locale_default" msgid="2593883646136326969">"По умолчанию"</string>
+    <string name="color_none" msgid="3475640044925814795">"Нет"</string>
+    <string name="color_white" msgid="8045195170201590239">"Белый"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Серый"</string>
+    <string name="color_black" msgid="7517353520909872561">"Черный"</string>
+    <string name="color_red" msgid="4949354900304125428">"Красный"</string>
+    <string name="color_green" msgid="5537717328428845841">"Зеленый"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Синий"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Голубой"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Желтый"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Пурпурный"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Обрабатывать ваши действия."</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Обновить"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медиа"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процессов"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Статистика запущенных процессов"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Использование памяти"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбрать другую систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Данная система синтеза речи может записывать произносимые слова, включая личные данные, такие как пароли и номера кредитных карт. Это осуществляет система <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Разрешить использование этой системы синтеза речи?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Чтобы включить синтезатор речи для этого языка, необходимо подключение к Интернету."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Это пример синтеза речи."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Язык по умолчанию"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> поддерживается"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> поддерживается только при подключении к сети"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не поддерживается"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Проверка..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Системы"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вкл."</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключение…"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Определение местоположения"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизация"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Яркость: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автонастройка"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Написание справа налево"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Включить написание справа налево для всех языков"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-ускорение"</string>
@@ -1916,6 +1952,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Нажать и оплатить"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Всегда спрашивать"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Сохранить настройку?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Отменить ограничения"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Изменить PIN-код"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index c332f35..8d1a4d5 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Stredná"</item>
     <item msgid="2372711992605524591">"Dlhá"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Predvolené"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif – zúžené"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Veľmi malé"</item>
+    <item msgid="6781094565687692782">"Malé"</item>
+    <item msgid="8222123259497646551">"Normálne"</item>
+    <item msgid="5813217276778560466">"Veľké"</item>
+    <item msgid="9044232017390975191">"Veľmi veľké"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Žiadne"</item>
+    <item msgid="1352974708028506778">"Obrys"</item>
+    <item msgid="5850876295428722675">"Tieň"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Čierne na bielom"</item>
+    <item msgid="1770533843436933500">"Biele na čiernom"</item>
+    <item msgid="1309255027325660115">"Žlté na čiernom"</item>
+    <item msgid="2985943780939258562">"Žlté na modrom"</item>
+    <item msgid="7520438652121629055">"Vlastné"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -386,7 +418,7 @@
     <item msgid="2920655562462493148">"1 280 x 720 tvdpi (zabezpečené)"</item>
     <item msgid="8910371271391940941">"1 920 x 1 080 xhdpi"</item>
     <item msgid="4171600481380800455">"1 920 x 1 080 xhdpi (zabezpečené)"</item>
-    <item msgid="1937752114395156918">"1280x720 tvdpi a 1920x1080 xhdpi"</item>
+    <item msgid="1937752114395156918">"1 280x720 tvdpi a 1 920x1 080 xhdpi"</item>
   </string-array>
   <string-array name="enable_opengl_traces_entries">
     <item msgid="3191973083884253830">"Žiadne"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nikdy nepovoliť"</item>
     <item msgid="1417929597727989746">"Vždy povoliť"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normálne"</item>
+    <item msgid="4517779899383204000">"stredné"</item>
+    <item msgid="406385694840950802">"nízke"</item>
+    <item msgid="4212263919458209842">"kritické"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 156b982..76d1888 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete sa pripojiť k zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Žiadosť telefónneho zoznamu"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Zariadenie %1$s žiada o prístup k vašim kontaktom a histórii hovorov. Povoliť zariadeniu %2$s prístup?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Nabudúce sa nepýtať"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Nabudúce sa nepýtať"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Požiadavka správy"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Zariadenie %1$s chce získať prístup k vašim správam. Chcete zariadeniu %2$s tento prístup umožniť?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavenia dátumu a času"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Miestne nastavenie (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká presnosť"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Šetrenie batérie"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Len senzory zariadenia"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Služby na zisťovanie polohy"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Odhadovať polohu pomocou systému GPS, siete Wi-Fi a mobilných sietí"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Odhadovať polohu pomocou siete Wi-Fi a mobilných sietí"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Na presné určenie polohy použiť systém GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmena bezpečnostného kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložený vzor"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Skúsiť znova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nakreslite bezpečnostný vzor:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nakreslite bezpečnostný vzor"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pomocníka zobrazíte stlačením klávesy Menu."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na záver zdvihnite prst z obrazovky."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimálny počet spojených bodov je <xliff:g id="NUMBER">%d</xliff:g>. Skúste to znova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Vzor bol zaznamenaný."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Znova nakreslite bezpečnostný vzor pre potvrdenie:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Nový bezpečnostný vzor:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na záver zdvihnite prst z obrazovky"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Minimálny počet spojených bodov je <xliff:g id="NUMBER">%d</xliff:g>. Skúste to znova."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Vzor bol zaznamenaný"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Znova nakreslite bezpečnostný vzor pre potvrdenie"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Nový bezpečnostný vzor"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potvrdiť"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Nakresliť znova"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Skúsiť znova"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Táto akcia obnoví predvoľby pre:\n\n "<li>"zakázané aplikácie,"</li>\n" "<li>"upozornenia zakázaných aplikácií,"</li>\n" "<li>"predvolené aplikácie pre akcie,"</li>\n" "<li>"obmedzenia údajov v pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Nestratíte žiadne údaje aplikácií."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavenia uľahčenia prístupu"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titulky"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestá priblíženia"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Keď je táto funkcia zapnutá, môžete približovať alebo odďalovať trojitým klepnutím na obrazovku.\n\nPočas priblíženia môžete:\n"<ul><li>"Posúvať: Ťahajte dvoma alebo viacerými prstami po obrazovke."</li>\n<li>"Prispôsobiť úroveň priblíženia: Priblížte dva alebo viacero prstov k sebe alebo ich od seba odtiahnite."</li></ul>\n\n"Obsah pod prstom môžete tiež dočasne priblížiť trojitým klepnutím a podržaním. V stave priblíženia môžete posúvaním prsta preskúmavať rôzne časti obrazovky. Odtiahnutím prsta sa vrátite do predchádzajúceho stavu.\n\nPoznámka: Priblíženie trojitým klepnutím funguje všade okrem klávesnice a navigačného panela."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka zjednodušeného ovládania"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavenia"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuté"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuté"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Ukážka"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Štandardné možnosti"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Jazyk"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Veľkosť textu"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Štýl titulkov"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Vlastné možnosti"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Farba pozadia"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprehľadnosť pozadia"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Farba textu"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Farba okraja"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Typ okraja"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Skupina písiem"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Titulky budú vyzerať takto"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predvolené"</string>
+    <string name="color_none" msgid="3475640044925814795">"Žiadna"</string>
+    <string name="color_white" msgid="8045195170201590239">"Biela"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Sivá"</string>
+    <string name="color_black" msgid="7517353520909872561">"Čierna"</string>
+    <string name="color_red" msgid="4949354900304125428">"Červená"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zelená"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Modrá"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Azúrová"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Žltá"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Purpurová"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Služba <xliff:g id="SERVICE">%1$s</xliff:g> vyžaduje nasledujúce funkcie:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Sledovať vaše akcie"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Obnoviť"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Štatistiky procesov"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Podrobné štatistiky spustených procesov"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Zvoliť iný nástroj"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Nástroj na syntézu reči môže zhromažďovať všetok hovorený text, vrátane osobných údajov, ako sú heslá alebo čísla kreditných kariet. Je založený na nástroji <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete aktivovať nástroj na syntézu reči?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"V prípade tohto jazyka je na prevod textu na rečový výstup potrebné pripojenie k sieti."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Toto je príklad syntézy reči"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Stav predvoleného jazyka"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> je plne podporovaný"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> vyžaduje pripojenie k sieti"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jazyk <xliff:g id="LOCALE">%1$s</xliff:g> nie je podporovaný"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Prebieha kontrola..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavenia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Možnosť <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivovaná"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizácia"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povoliť trasovanie OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobraziť hranice rozlož."</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynútiť smer rozlož. RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynútiť smer rozlož. obraz. RTL pre všetky jazyky"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva obr. s aktuálnym využ. procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vynútiť vykresľovanie GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Platenie priložením"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vždy sa opýtať"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Nastaviť ako predvoľbu?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Obmedzenia"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstrániť obmedzenia"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmeniť kód PIN"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 8b0831a..98723d2 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Srednja"</item>
     <item msgid="2372711992605524591">"Dolgo"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Privzeto"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif, zgoščena"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Stalna širina"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Zelo majhna"</item>
+    <item msgid="6781094565687692782">"Majhna"</item>
+    <item msgid="8222123259497646551">"Običajna"</item>
+    <item msgid="5813217276778560466">"Velika"</item>
+    <item msgid="9044232017390975191">"Zelo velika"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Brez"</item>
+    <item msgid="1352974708028506778">"Oris"</item>
+    <item msgid="5850876295428722675">"Senca"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Črno na belem"</item>
+    <item msgid="1770533843436933500">"Belo na črnem"</item>
+    <item msgid="1309255027325660115">"Rumeno na črnem"</item>
+    <item msgid="2985943780939258562">"Rumeno na modrem"</item>
+    <item msgid="7520438652121629055">"Po meri"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Nikoli ne dovoli"</item>
     <item msgid="1417929597727989746">"Vedno dovoli"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"običajno"</item>
+    <item msgid="4517779899383204000">"zmerno"</item>
+    <item msgid="406385694840950802">"nizko"</item>
+    <item msgid="4212263919458209842">"kritično"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 83f664f..dded0be 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Se želite povezati z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Zahteva za telefonski imenik"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s želi dostop do vaših stikov in zgodovine klicev. Želite dovoliti dostop osebi %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ne vprašaj me več"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ne vprašaj me več"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Zahteva za dostop do sporočil"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s želi dostopati do vaših sporočil. Želite omogočiti dostop za %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum in nastavitve"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Območni (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Samo senzorji naprave"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Lokacijske storitve"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Uporaba GPS-a, Wi-Fi-ja in mobilnih omrežij za oceno lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Uporaba Wi-Fi-ja in mobilnih omrežij za oceno lokacije"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Uporaba GPS-a za oceno vaše lokacije"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Prenašanje …"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi-ja in mob. omr."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Določanje lokacije z Wi‑Fi-jem"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Spremeni kodo PIN za odklepanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potrdite shranjeni vzorec"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Poskusite znova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Narišite vzorec za odklepanje:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nariši vzorec za odklepanje"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Če želite pomoč, pritisnite meni."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ko končate, dvignite prst."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite vsaj <xliff:g id="NUMBER">%d</xliff:g> pik. Poskusite znova:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Vzorec shranjen."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Znova narišite vzorec, da ga potrdite:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Novi vzorec za odklepanje:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ko končate, dvignite prst"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Povežite vsaj toliko pik: <xliff:g id="NUMBER">%d</xliff:g>. Poskusite znova."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Vzorec je shranjen"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Znova narišite vzorec, da ga potrdite"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Novi vzorec za odklepanje"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Potrdi"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Ponovno nariši"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Poskusi znova"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"S tem se bodo ponastavile vse nastavitve za:\n\n "<li>"onemogočene aplikacije,"</li>\n" "<li>"obvestila za onemogočene aplikacije,"</li>\n" "<li>"privzete aplikacije za dejanja,"</li>\n" "<li>"omejitev prenosa podatkov v ozadju za aplikacije,"</li>\n" "<li>"omejitve dovoljenj."</li>\n\n" Podatkov iz aplikacij ne boste izgubili."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavitev aplikacij"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavitve pripomočkov za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Storitve"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisi"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Poteze za povečavo"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Če je ta funkcija vklopljena, lahko vsebino na zaslonu povečate ali pomanjšate tako, da se trikrat dotaknete zaslona.\n\nPri povečavi lahko:\n"<ul><li>"Pomikate vsebino na zaslonu: Dva prsta ali več povlecite po zaslonu."</li>\n<li>"Prilagodite stopnjo povečave/pomanjšave: Najmanj dva prsta približajte ali razširite."</li></ul>\n\n"Začasno lahko tisto, kar je pod vašim prstom, povečate tudi tako, da se zaslona trikrat dotaknete in ga pridržite. V tem načinu povečave lahko povlečete s prstom in raziščete različne dele zaslona. Dvignite prst, če se želite vrniti v prejšnje stanje.\n\nOpomba: Trojni dotik za povečavo deluje povsod, razen pri tipkovnici in v vrstici za krmarjenje"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. prip. za ljudi s pos. pot."</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavitve"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Vklopljeno"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izkloplj."</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Predogled"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardne možnosti"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Jezik"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Velikost besedila"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Slog napisov"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Možnosti po meri"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Barva ozadja"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Neprosojnost ozadja"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Barva besedila"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Barva roba"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Vrsta roba"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Skupina pisav"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Napisi bodo videti tako:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Privzeto"</string>
+    <string name="color_none" msgid="3475640044925814795">"Brez"</string>
+    <string name="color_white" msgid="8045195170201590239">"Bela"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Siva"</string>
+    <string name="color_black" msgid="7517353520909872561">"Črna"</string>
+    <string name="color_red" msgid="4949354900304125428">"Rdeča"</string>
+    <string name="color_green" msgid="5537717328428845841">"Zelena"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Modra"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cijan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Rumena"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Opazujte svoja dejanja"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Osveži"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Predstavnostni strežnik"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistični podatki o procesih"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Statistični podatki o procesih, ki se izvajajo"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Poraba pomnilnika"</string>
+    <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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izberite drug mehanizem"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ta mehanizem za sintezo govora bo morda lahko zbiral izgovorjeno besedilo, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča ga mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Ali želite omogočiti uporabo tega mehanizma za sintezo govora?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Za pretvorbo besedila v govor potrebuje ta jezik delujočo omrežno povezavo."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"To je primer sinteze govora."</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Stanje privzetega jezika"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Jezik <xliff:g id="LOCALE">%1$s</xliff:g> je v celoti podprt"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> zahteva omrežno povezavo"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Jezik <xliff:g id="LOCALE">%1$s</xliff:g> ni podprt"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Preverjanje ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mehanizmi"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavitve za <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je omogočen"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"izklapljanje"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinhronizacija"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Svetlost <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"samodejno"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaz mej postavitve"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaži meje obrezovanja, obrobe ipd."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vsili od desne proti levi"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vsili smer postavitve na zaslonu od desne proti levi za vse jezike"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje tren. uporabo CPE-ja"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vsili upodabljanje z GPU-jem"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Plačilo z dotikom"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Vedno vprašaj"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Želite nastaviti kot prednostno?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omejitve"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstranitev omejitev"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Sprememba kode PIN"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 43d9f20..95fac89 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Средње"</item>
     <item msgid="2372711992605524591">"Дугачко"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Подразумевано"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Скупљени sans-serif"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Непропорционално"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Веома мала"</item>
+    <item msgid="6781094565687692782">"Мала"</item>
+    <item msgid="8222123259497646551">"Нормална"</item>
+    <item msgid="5813217276778560466">"Велика"</item>
+    <item msgid="9044232017390975191">"Веома велика"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Ништа"</item>
+    <item msgid="1352974708028506778">"Контура"</item>
+    <item msgid="5850876295428722675">"Падајућа сенка"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Црно на бело"</item>
+    <item msgid="1770533843436933500">"Бело на црно"</item>
+    <item msgid="1309255027325660115">"Жуто на црно"</item>
+    <item msgid="2985943780939258562">"Жуто на плаво"</item>
+    <item msgid="7520438652121629055">"Прилагођено"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Никада не дозволи"</item>
     <item msgid="1417929597727989746">"Увек дозволи"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"уобичајена"</item>
+    <item msgid="4517779899383204000">"средња"</item>
+    <item msgid="406385694840950802">"мала"</item>
+    <item msgid="4212263919458209842">"критична"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a54398c..92fc6b6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Да ли желите да се повежете са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Захтев за телефонски именик"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s жели да приступи вашим контактима и историји позива. Желите ли да одобрите приступ за %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Не питај поново"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не питај поново"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Захтев за поруку"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s жели да приступи порукама. Желите ли да одобрите приступ за %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Подешавања датума и времена"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Регионално (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Велика прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Уштеда батерије"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Само сензори за уређаје"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Локација је искључена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Недавни захтеви за локацију"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Услуге локације"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi и мобилне мреже за приближну локацију"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi и мобилне мреже за приближну локацију"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"GPS за тачну локацију"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Локац. на основу Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промени PIN за откључавање"</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="2063630508212535241">"Нацртајте шаблон за откључавање:"</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="4622772178078818425">"Пустите прст када завршите."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Повежите се са најмање <xliff:g id="NUMBER">%d</xliff:g> тачке(ака). Покушајте поново:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Образац је снимљен."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Поново нацртајте шаблон како бисте потврдили:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Нови шаблон за откључавање:"</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_confirm_button_text" msgid="1128204343957002841">"Потврди"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Поново нацртај"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Покушај поново"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширане процесе"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања аплик."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Жел. да ресет. под. апл.?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Овим ћете вратити на почетне вредности сва подешавања за:\n\n "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења за позадинске податке за апликације"</li>\n" "<li>"Било каква ограничења за дозволе"</li>\n\n" Нећете изгубити никакве податке апликација."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетуј апликације"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Подешавања приступачности"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуге"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Титл"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Покрети за увећање"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Када је ова функција укључена, можете да увећавате и да умањујете приказ троструким додиром на екран.\n\nДок сте у увећаном приказу, можете:\n"<ul><li>"да померате: Превуците два или више прстију преко екрана."</li>\n<li>"да прилагођавате ниво зумирања: Спојите два или више прстију или их раширите."</li></ul>\n\n"Такође можете привремено да увећате оно што вам је под прстом троструким додиром и задржавањем. У овом увећаном приказу можете да превлачите прст да бисте истраживали различите делове екрана. Подигните прст да бисте се вратили у претходни приказ.\n\nНапомена: Троструки додир за увећање функционише свуда осим на тастатури и траци за навигацију."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пречица за приступачност"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подешавања"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Укључено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Искључено"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Преглед"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Стандардне опције"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Језик"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Величина текста"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Стил титла"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Прилагођене опције"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Боја позадине"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Непрозирност позадине"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Боја текста"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Боја ивице"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Тип ивице"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Породица фонтова"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Титл ће изгледати овако"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Подразумевано"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ништа"</string>
+    <string name="color_white" msgid="8045195170201590239">"Бела"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Сива"</string>
+    <string name="color_black" msgid="7517353520909872561">"Црна"</string>
+    <string name="color_red" msgid="4949354900304125428">"Црвена"</string>
+    <string name="color_green" msgid="5537717328428845841">"Зелена"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Плава"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Цијан"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Жута"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да обавља следеће радње:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Праћење ваших радњи"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Освежи"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android ОС"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Медија сервер"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процеса"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Штреберска статистика о активним процесима"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Искоришћеност меморије"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање језика у говор."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Ово је пример синтезе говора"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Статус подразумеваног језика"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> је подржан у потпуности"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> захтева везу са мрежом"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> није подржан"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Провера..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Машине"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> подешавања"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је омогућено"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"искључивање"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Локација"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизација"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Осветљење: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аутоматскo"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Прикажи границе распореда"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Прикажи границе клипа, маргине итд."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Наметни смер распореда здесна налево"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Наметни смер распореда екрана здесна налево за све локалитете"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Додирни и плати"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Питај сваки пут"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Желите ли да поставите као жељено подешавање?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничења"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Уклони ограничења"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 24fad0c..a97a552 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Mellan"</item>
     <item msgid="2372711992605524591">"Lång"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Standard"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif Condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Mycket liten"</item>
+    <item msgid="6781094565687692782">"Liten"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Stor"</item>
+    <item msgid="9044232017390975191">"Mycket stor"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Inga"</item>
+    <item msgid="1352974708028506778">"Disposition"</item>
+    <item msgid="5850876295428722675">"Bakgrundsskugga"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25 %"</item>
+    <item msgid="2367156416247936773">"50 %"</item>
+    <item msgid="5395560410107149298">"75 %"</item>
+    <item msgid="8342334626783983353">"100 %"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Svart på vitt"</item>
+    <item msgid="1770533843436933500">"Vitt på svart"</item>
+    <item msgid="1309255027325660115">"Gult på svart"</item>
+    <item msgid="2985943780939258562">"Gult på blått"</item>
+    <item msgid="7520438652121629055">"Anpassat"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Tillåt aldrig"</item>
     <item msgid="1417929597727989746">"Tillåt alltid"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"ganska god"</item>
+    <item msgid="406385694840950802">"låg"</item>
+    <item msgid="4212263919458209842">"kritiskt låg"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bae9e46..20c58ab 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vill du ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefonboksbegäran"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s vill ha åtkomst till dina kontakter och din samtalshistorik. Vill du ge %2$s åtkomst?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Fråga inte igen"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Fråga inte igen"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Meddelandebegäran"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vill ha åtkomst till dina meddelanden. Vill du ge %2$s åtkomst?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Lokalt (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög exakthet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparfunktion"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Endast enhetssensorer"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Plats av"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Platstjänster"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi-Fi och mobila nätverk"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Med Wi-Fi och mobila nätverk"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Hitta din plats med GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Plats från Wi-Fi/mobilnätverk"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Platsen fastställs via Wi-Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ändra PIN-kod för upplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Försök igen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Rita ett grafiskt lösenord:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rita ett grafiskt lösenord"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryck på Menu om du vill ha hjälp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lyft fingret när du är klar."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Det grafiska lösenordet har registrerats."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Rita ditt grafiska lösenord igen för att bekräfta:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ditt nya grafiska lösenord:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lyft fingret när du är klar"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Det grafiska lösenordet har registrerats"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Rita ditt grafiska lösenord igen för att bekräfta"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ditt nya grafiska lösenord"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Bekräfta"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Rita igen"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Försök igen"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Det återställer alla inställningar för:\n\n "<li>"Inaktiverade appar"</li>\n" "<li>"Inaktiverade appmeddelanden"</li>\n" "<li>"Standardappar för åtgärder"</li>\n" "<li>"Begränsningar i bakgrundsdata för appar"</li>\n" "<li>"Begränsningar för alla behörigheter"</li>\n\n" Ingen appdata kommer att försvinna."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Återställ appar"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tillgänglighetsinställningar"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjänster"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Textning"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Förstoringsrörelser"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"När den här funktionen är aktiverad kan du zooma in och ut genom att trycka tre gånger på skärmen.\n\nNär du har zoomat in kan du göra följande saker:\n"<ul><li>"Panorera: Dra minst två fingrar över skärmen."</li>\n<li>"Justera zoomen: Nyp eller dra isär med minst två fingrar."</li></ul>\n\n"Du kan också förstora något tillfälligt genom att trycka tre gånger på det och hålla kvar. I det förstorade läget kan du utforska olika delar av skärmen genom att dra med fingret. Återgå till föregående läge genom att släppa fingret.\n\nObs! Det går att förstora genom att trycka tre gånger överallt utom på tangentbordet och navigeringsfältet."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Inställningar"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Förhandsgranskning"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standardalternativ"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Språk"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Textstorlek"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Textstil"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Anpassade alternativ"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Bakgrundsfärg"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Genomskinlighet för bakgrunden"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Textfärg"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Kantfärg"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Typ av kant"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Teckensnittsfamilj"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Textstilen kommer att se ut så här"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Standard"</string>
+    <string name="color_none" msgid="3475640044925814795">"Ingen"</string>
+    <string name="color_white" msgid="8045195170201590239">"Vit"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Grå"</string>
+    <string name="color_black" msgid="7517353520909872561">"Svart"</string>
+    <string name="color_red" msgid="4949354900304125428">"Röd"</string>
+    <string name="color_green" msgid="5537717328428845841">"Grön"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Blå"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Gul"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observera dina aktiviteter"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Uppdatera"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Operativsystemet Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistik"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Nördig statistik om processer som körs"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Minnesanvändning"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Välj en annan motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Talsyntesmotorn kan samla in all text som ska talas, inklusive personlig information som lösenord och kreditkortsnummer. Den kommer från <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-motorn. Vill du använda den här talsyntesmotorn?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Det krävs en fungerande nätverksanslutning för att text-till-tal ska fungera för det här språket."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Detta är ett exempel på talsyntes"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status för standardspråk"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> stöds"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> kräver nätverksanslutning"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> stöds inte"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Kontrollerar ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-inställningar"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är aktiverad"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"inaktiverar"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Plats"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronisera"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Ljusstyrka <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatiskt"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Visa layoutgränser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tvinga fram RTL-layout"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tvinga fram RTL-skärmlayout (hö–vä) för alla språk"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Överlägg på skärmen med aktuell CPU-användning"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Framtvinga GPU-rendering"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Snudda och betala"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Fråga varje gång"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Vill du ange den här som standard?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Begränsningar"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ta bort begränsningar"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ändra PIN-koden"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index c797d9e..a0256b3 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -279,7 +279,7 @@
     <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
     <item msgid="2029227495214047094">"kaa chonjo"</item>
     <item msgid="26109888160231211">"fuatilia eneo"</item>
-    <item msgid="5753382310468855812">"fuatilia eneo lenye nguvu za juu"</item>
+    <item msgid="5753382310468855812">"fuatilia eneo kuu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Eneo"</item>
@@ -324,13 +324,45 @@
     <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
     <item msgid="4665183401128289653">"Kaa chonjo"</item>
     <item msgid="8584357129746649222">"Eneo"</item>
-    <item msgid="7669257279311110599">"Mahali"</item>
+    <item msgid="7669257279311110599">"Eneo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
     <item msgid="2372711992605524591">"Ndefu"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Chaguo-msingi"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif iliyofupishwa"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Ndogo sana"</item>
+    <item msgid="6781094565687692782">"Ndogo"</item>
+    <item msgid="8222123259497646551">"Ya Kawaida"</item>
+    <item msgid="5813217276778560466">"Kubwa"</item>
+    <item msgid="9044232017390975191">"Kubwa sana"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Hakuna"</item>
+    <item msgid="1352974708028506778">"Muhtasari"</item>
+    <item msgid="5850876295428722675">"Angusha kivuli"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Nyeusi kwenye nyeupe"</item>
+    <item msgid="1770533843436933500">"Nyeupe kwenye nyeusi"</item>
+    <item msgid="1309255027325660115">"Manjano kwenye nyeusi"</item>
+    <item msgid="2985943780939258562">"Manjano kwenye samawati"</item>
+    <item msgid="7520438652121629055">"Maalum"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Usiruhusu kamwe"</item>
     <item msgid="1417929597727989746">"Ruhusu kila wakati"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"kawaida"</item>
+    <item msgid="4517779899383204000">"wastani"</item>
+    <item msgid="406385694840950802">"chini"</item>
+    <item msgid="4212263919458209842">"muhimu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 12b0401..545003c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -167,7 +167,10 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for bluetooth_pb_acceptance_dialog_text (6555508756987053866) -->
     <skip />
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Usiniulize tena"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Ombi la ujumbe"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s inataka kufikia ujumbe wako. Ipe ufikiaji kwa %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mipangilio ya tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Mkoa ( <xliff:g id="DATE">%s</xliff:g> )"</string>
@@ -981,14 +984,18 @@
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa juu"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inaokoa betri"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Sensa ya vifaa pekee"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Huduma za eneo"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Tumia GPS, Wi-Fi na mitandao ya simu kukisia eneo"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Tumia Wi-Fi na mitandao ya simu kukisia eneo"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Tumia GPS kutambua eneo lako"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Inarejesha…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kukadiria mahali ili kukadiria mahali ulipo kwa haraka. Data ya mahali pasipojulikana itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -1036,13 +1043,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha mchoro uliohifadhiwa"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Jaribu tena:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Chora ruwaza ya kufungua:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Mchoro wa kufungua"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ukimaliza achilia kidole"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Unganisha angalau vitone <xliff:g id="NUMBER">%d</xliff:g>. Jaribu tena:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Mchoro umerekodiwa."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Chora mchoro tena ili kuthibitisha:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Mchoro wako mpya wa kufungua"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Ondoa kidole ukimaliza"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Unganisha angalau vitone <xliff:g id="NUMBER">%d</xliff:g>. Jaribu tena."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Mchoro wa kufungua umerekodiwa"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Chora tena mchoro wa kufungua ili kuthibitisha"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Mchoro wako mpya wa kufungua"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Thibitisha"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Chora tena"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Jaribu tena"</string>
@@ -1110,8 +1117,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo-msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya programu"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
@@ -1350,6 +1356,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mipangilio ya ufikiaji"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ishara za ukuzaji"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu.\n\nUnapokuwa umekuza, unaweza:\n"<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole viwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali.\n\nDokezo: Kugonga mara tatu ili kukuza hufanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kubadilisha sehemu za skrini."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikivu"</string>
@@ -1366,6 +1373,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mipangilio"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Imewashwa"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Imezimwa"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Chungulia kwanza"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Chaguo muundo-msingi"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Language"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Ukubwa wa maandishi"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Mtindo wa maelezo mafupi"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Chaguo maalum"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Rangi ya mandharinyuma"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Uvulivuli wa Mandhari"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Rangi ya maandishi"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Rangi ya ukingo"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Aina ya ukingo"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Jamii ya Fonti"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Manukuu yataonekana hivi"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Chaguo-msingi"</string>
+    <string name="color_none" msgid="3475640044925814795">"Hakuna"</string>
+    <string name="color_white" msgid="8045195170201590239">"Nyeupe"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Kijivu"</string>
+    <string name="color_black" msgid="7517353520909872561">"Nyeusi"</string>
+    <string name="color_red" msgid="4949354900304125428">"Nyekundu"</string>
+    <string name="color_green" msgid="5537717328428845841">"Kijani"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Samawati"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Samawati-Kijani"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Manjano"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Majenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Je, ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Chunguza vitendo vyako"</string>
@@ -1463,6 +1495,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Onyesha upya"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"OS ya Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Seva ya media"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Takwimu za Mchakato"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Takwimu za kitaalamu kuhusu michakato inayoendeshwa"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Kumbukumbu iliyotumika"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1496,16 +1533,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chagua injini nyingine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hotuba hii inawezesha injini huenda ikaweza kukusanya maandishi ambayo yatazungumziwa, ikijumlisha data ya kibinafsi ya nenosiri na namba ya kaddi ya mkopo. Inatoka kwa injini ya <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Wezesha matumizi ya hotuba hii iliyowezeshwa ya injini?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Lugha hii inahitaji muunganisho wa mtandao unaofanya kazi kwa towe ya maandishi hadi sauti."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Huu ni mfano wa usanisi usemaji"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Hali ya lugha chaguo-msingi"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> inaweza kutumiwa kikamilifu"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> inahitaji muunganisho wa mtandao"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> haiwezi kutumiwa"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Tunakagua..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Injini"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mipangilio"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> imewezeshwa"</string>
@@ -1532,7 +1565,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Inazima"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Eneo"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sawazisha"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Ung`avu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatiki"</string>
@@ -1716,6 +1749,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Wezesha ufuatiliaji wa OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Onyesha mipaka ya mpangilio"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Onyesha mipaka ya picha, kingo, nk."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Lazimisha uelekezaji wa muundo wa RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Lazimisha uelekezaji wa muundo wa skrini kwa RTL kwa lugha zote"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
@@ -1908,6 +1943,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Gonga na Ulipe"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Uliza kila wakati"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Ungependa kuweka kama mapendeleo yako?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 7fc113c..a8466d8 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -279,7 +279,7 @@
     <item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
     <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
     <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</item>
-    <item msgid="5753382310468855812">"ตรวจติดตามตำแหน่งพลังงานสูง"</item>
+    <item msgid="5753382310468855812">"ติดตามตำแหน่งโดยใช้พลังงานมาก"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"ปานกลาง"</item>
     <item msgid="2372711992605524591">"ยาว"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"ค่าเริ่มต้น"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif แบบย่อ"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"ช่องว่างเดี่ยว"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"เล็กมาก"</item>
+    <item msgid="6781094565687692782">"เล็ก"</item>
+    <item msgid="8222123259497646551">"ปกติ"</item>
+    <item msgid="5813217276778560466">"ใหญ่"</item>
+    <item msgid="9044232017390975191">"ใหญ่มาก"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"ไม่มี"</item>
+    <item msgid="1352974708028506778">"ตีกรอบ"</item>
+    <item msgid="5850876295428722675">"เงาตกกระทบ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"สีดำบนพื้นสีขาว"</item>
+    <item msgid="1770533843436933500">"สีขาวบนพื้นสีดำ"</item>
+    <item msgid="1309255027325660115">"สีเหลืองบนพื้นสีดำ"</item>
+    <item msgid="2985943780939258562">"สีเหลืองบนพื้นสีน้ำเงิน"</item>
+    <item msgid="7520438652121629055">"กำหนดเอง"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"ไม่อนุญาตเลย"</item>
     <item msgid="1417929597727989746">"อนุญาตเสมอ"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"ปกติ"</item>
+    <item msgid="4517779899383204000">"ปานกลาง"</item>
+    <item msgid="406385694840950802">"ต่ำ"</item>
+    <item msgid="4212263919458209842">"วิกฤต"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0abf4f9..228c027 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"คุณต้องการเชื่อมต่อไปยัง \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" หรือไม่"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"คำขอสมุดโทรศัพท์"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s ต้องการเข้าถึงสมุดติดต่อและประวัติการโทรของคุณ อนุญาตให้ %2$s เข้าถึงหรือไม่"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"ไม่ต้องถามอีก"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ไม่ต้องถามอีก"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"คำขอข้อความ"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s ต้องการเข้าถึงข้อความของคุณ ให้สิทธิ์เข้าถึงแก่ %2$s ไหม"</string>
     <string name="date_and_time" msgid="4114084177056654663">"การตั้งเวลาและวันที่"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"ท้องถิ่น (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ความแม่นยำสูง"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ประหยัดแบตเตอรี่"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"เซ็นเซอร์ของอุปกรณ์เท่านั้น"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"ปิดตำแหน่ง"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"คำขอตำแหน่งล่าสุด"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"บริการตำแหน่ง"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"ใช้ GPS, WiFi, มือถือหาตำแหน่ง"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"ใช้ WiFi และมือถือหาตำแหน่ง"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"ใช้ GPS เพื่อระบุตำแหน่งของคุณ"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"ตำแหน่ง WiFi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"เปลี่ยน PIN สำหรับปลดล็อก"</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="2063630508212535241">"ลากรูปแบบสำหรับปลดล็อก"</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="4622772178078818425">"ปล่อยนิ้วเมื่อเสร็จแล้ว"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"โยงอย่างน้อย <xliff:g id="NUMBER">%d</xliff:g> จุด ลองใหม่อีกครั้ง:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"บันทึกรูปแบบแล้ว"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"วาดรูปแบบอีกครั้งเพื่อยืนยัน:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"รูปแบบการปลดล็อกใหม่ของคุณ:"</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_confirm_button_text" msgid="1128204343957002841">"ยืนยัน"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"วาดซ้ำ"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"ลองอีกครั้ง"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"แสดงกระบวนการที่เก็บแคชไว้"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอปพลิเคชัน"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปหรือไม่"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"การดำเนินการนี้จะรีเซ็ตค่ากำหนดทั้งหมดสำหรับ:\n\n "<li>"แอปที่ปิดใช้งาน"</li>\n" "<li>"การแจ้งเตือนแอปที่ปิดใช้งาน"</li>\n" "<li>"แอปพลิเคชันเริ่มต้นสำหรับการทำงานต่างๆ"</li>\n" "<li>"}ข้อจำกัดข้อมูลในพื้นหลังสำหรับแอป"</li>\n" "<li>"ข้อจำกัดสิทธิ์ใดๆ"</li>\n\n" ทั้งนี้ คุณจะไม่สูญเสียข้อมูลใดๆ ของแอป"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"รีเซ็ตแอปพลิเคชัน"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"การตั้งค่าการเข้าถึง"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"บริการ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"ระบบ"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"คำอธิบายภาพ"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"ท่าทางสัมผัสการขยาย"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"เมื่อเปิดคุณลักษณะนี้ คุณสามารถย่อและขยายด้วยการแตะสามครั้งบนหน้าจอ\n\nขณะที่ขยายอยู่ คุณสามารถ:\n"<ul><li>"แพน: ใช้อย่างน้อยสองนิ้วลากผ่านหน้าจอ"</li>\n<li>"ปรับระดับการย่อ/ขยาย: บีบหรือแยกอย่างน้อยสองนิ้วเพื่อปรับระดับ"</li></ul>\n\n"คุณยังสามารถขยายสิ่งที่นิ้วคุณแตะอยู่ชั่วคราวได้ด้วยการแตะสามครั้งค้างไว้ เมื่อขยายแล้ว คุณสามารถใช้นิ้วลากเพื่อดูส่วนต่างๆ ของหน้าจอได้ด้วย ยกนิ้วขึ้นเพื่อกลับไปยังสถานะก่อนหน้า\n\nหมายเหตุ: การแตะสามครั้งเพื่อขยายใช้ได้กับทุกส่วนยกเว้นแป้นพิมพ์และแถบนำทาง"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"การตั้งค่า"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"เปิด"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ปิด"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"ดูตัวอย่าง"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"ตัวเลือกมาตรฐาน"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"ภาษา"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"ขนาดข้อความ"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"รูปแบบคำบรรยายภาพ"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ตัวเลือกที่กำหนดเอง"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"สีพื้นหลัง"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"ความโปร่งแสงของพื้นหลัง"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"สีข้อความ"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"สีขอบ"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"ชนิดขอบ"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"ชุดแบบอักษร"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"คำอธิบายภาพจะมีหน้าตาแบบนี้"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"ค่าเริ่มต้น"</string>
+    <string name="color_none" msgid="3475640044925814795">"ไม่มีสี"</string>
+    <string name="color_white" msgid="8045195170201590239">"ขาว"</string>
+    <string name="color_gray" msgid="9192312087142726313">"เทา"</string>
+    <string name="color_black" msgid="7517353520909872561">"ดำ"</string>
+    <string name="color_red" msgid="4949354900304125428">"แดง"</string>
+    <string name="color_green" msgid="5537717328428845841">"เขียว"</string>
+    <string name="color_blue" msgid="7731984529016953223">"น้ำเงิน"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"ฟ้า"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"เหลือง"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"ม่วงแดง"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ใช่ไหม"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"สังเกตการทำงานของคุณ"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"รีเฟรช"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการของ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"สถิติเกี่ยวกับกระบวนงาน"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"สถิติเชิงลึกเกี่ยวกับกระบวนงานที่ทำงานอยู่"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"การใช้หน่วยความจำ"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"เลือกเครื่องมืออื่น"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"โปรแกรมสังเคราะห์เสียงนี้อาจเก็บข้อความทั้งหมดที่ได้ยิน รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โปรแกรมนี้มาจากโปรแกรม <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> คุณต้องการเปิดใช้งานโปรแกรมสังเคราะห์เสียงนี้หรือไม่"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"ภาษานี้ต้องใช้การเชื่อมต่อเครือข่ายซึ่งใช้การได้สำหรับการแปลงข้อความเป็นเสียงพูด"</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"นี่เป็นตัวอย่างการสังเคราะห์เสียง"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"สถานะของภาษาเริ่มต้น"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"สนับสนุน<xliff:g id="LOCALE">%1$s</xliff:g>อย่างสมบูรณ์"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"ต้องมีการเชื่อมต่อเครือข่ายสำหรับ<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"ไม่สนับสนุน<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"กำลังตรวจสอบ..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"โปรแกรม"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"การตั้งค่า <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"เปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"กำลังปิด"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"บลูทูธ"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ตำแหน่ง"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ซิงค์"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ความสว่าง <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"อัตโนมัติ"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"แสดงขอบของการจัดวาง"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"บังคับทิศทางการจัดวาง RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"บังคับทิศทางการจัดวางหน้าจอเป็น RTL สำหรับทุกภาษา"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"แตะและจ่าย"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"ถามทุกครั้ง"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"ตั้งเป็นค่ากำหนดของคุณไหม"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"ข้อจำกัด"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ลบข้อจำกัด"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"เปลี่ยน PIN"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index fc6eeff..1ef066a 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Katamtaman"</item>
     <item msgid="2372711992605524591">"Mahaba"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Default"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Napakaliit"</item>
+    <item msgid="6781094565687692782">"Maliit"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Malaki"</item>
+    <item msgid="9044232017390975191">"Napakalaki"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Wala"</item>
+    <item msgid="1352974708028506778">"Outline"</item>
+    <item msgid="5850876295428722675">"Drop shadow"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Itim sa puti"</item>
+    <item msgid="1770533843436933500">"Puti sa itim"</item>
+    <item msgid="1309255027325660115">"Dilaw sa itim"</item>
+    <item msgid="2985943780939258562">"Dilaw sa asul"</item>
+    <item msgid="7520438652121629055">"Custom"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Huwag kailanman payagan"</item>
     <item msgid="1417929597727989746">"Palaging payagan"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"katamtaman"</item>
+    <item msgid="406385694840950802">"mababa"</item>
+    <item msgid="4212263919458209842">"kritikal"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 94fd704..111f798 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Nais mo bang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Kahilingan sa phone book"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"Nais na i-access ni %1$s ang iyong mga contact at kasaysayan ng tawag. Bigyan ng access si %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Huwag nang tatanungin muli"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Huwag nang tatanungin muli"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Kahilingang mensahe"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"Gustong i-access ni %1$s ang iyong mga mensahe. Bigyan ng access si %2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mga setting ng petsa &amp; oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Panrehiyon (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Napakatumpak"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pagtitipid ng baterya"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Mga sensor ng device lang"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Mga serbisyo sa lokasyon"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"GPS, Wi‑Fi at mobile network, ipangtantiya ng lokasyon"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Wi‑Fi at mobile network, ipangtantiya ng lokasyon"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Ipangtukoy ng lokasyon mo ang GPS"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Lokasyon ng Wi-Fi, mobile network"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Natukoy ng Wi-Fi ang lokasyon"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Subukang muli:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Gumuhit ng pattern sa pag-unlock:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kunin ang naka-unlock pattern"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bitawan sa pagkakapindot kapag tapos na."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Na-record ang pattern."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Kumuha muli ng pattern upang makumpirma:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ang iyong bagong naka-unlock na pattern:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"I-angat ang daliri kapag tapos na"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Na-record na ang pattern"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Muling iguhit ang pattern upang kumpirmahin"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ang iyong bagong pattern sa pag-unlock"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Kumpirmahin"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"I-redraw"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Muling subukan"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n "<li>"Naka-disable na apps"</li>\n" "<li>"Mga naka-disable na notification ng app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Mga paghihigpit sa data sa background para sa apps"</li>\n" "<li>"Anumang mga paghihigpit sa pahintulot"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"I-reset ang apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mga setting ng pagiging maa-access"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Mga Serbisyo"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Mga Caption"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Mga galaw sa pag-magnify"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kapag naka-on ang tampok na ito, maaari kang mag-zoom in at out sa pamamagitan ng pag-tap sa screen nang tatlong beses.\n\nHabang naka-zoom in, maaari kang:\n"<ul><li>"Mag-pan: I-drag ang dalawa o higit pang mga daliri sa screen."</li>\n<li>"Ayusin ang antas ng pag-zoom: I-pinch ang dalawa o higit pang daliri o paghiwalayin ang mga ito."</li></ul>\n\n"Maaari mo ring pansamantalang i-magnify kung ano ang nasa ilalim ng iyong mga daliri sa pamamagitan ng pag-tap nang tatlong beses at pagpindot nang matagal. Sa antas na naka-magnify, maaari mong i-drag ang iyong daliri upang maggalugad sa iba\'t ibang mga bahagi ng screen. Angatin ang iyong daliri upang bumalik sa iyong nakaraang katayuan.\n\nTandaan: Gumagana saanman ang pag-tap nang tatlong beses para sa pag-magnify maliban sa keyboard at navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Naka-on"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Naka-off"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"I-preview"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Mga karaniwang pagpipilian"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Wika"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Laki ng text"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Istilo ng caption"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Mga custom na pagpipilian"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Kulay ng background"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Opacity ng background"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Kulay ng text"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Kulay ng gilid"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Uri ng gilid"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Hanay ng font"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Ganito ang magiging hitsura ng mga caption"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Default"</string>
+    <string name="color_none" msgid="3475640044925814795">"Wala"</string>
+    <string name="color_white" msgid="8045195170201590239">"Puti"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gray"</string>
+    <string name="color_black" msgid="7517353520909872561">"Itim"</string>
+    <string name="color_red" msgid="4949354900304125428">"Pula"</string>
+    <string name="color_green" msgid="5537717328428845841">"Berde"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Asul"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Dilaw"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserbahan ang iyong mga pagkilos"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"I-refresh"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Mga Istatistika ng Proseso"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Mahahalagang istatistika tungkol sa mga tumatakbong proseso"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Memory na ginamit"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pumili ng isa pang engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Maaaring makolekta ng speech synthesis engine na ito ang lahat ng teksto na sasabihin, kabilang ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Paganahin ang paggamit ng speech synthesis engine na ito?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Nangangailangan ang wikang ito ng gumaganang koneksyon sa network para sa text-to-speech na output."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Isa itong halimbawa ng speech synthesis"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Status ng default na wika"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"Ganap na sinusuportahan ang <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"Kailangan ng <xliff:g id="LOCALE">%1$s</xliff:g> ng koneksyon sa network"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"Hindi sinusuportahan ang <xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Tinitingnan..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mga Engine"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> (na) setting"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"pag-off"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Lokasyon"</string>
     <string name="gadget_sync" msgid="858895763714222152">"I-sync"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"awtomatiko"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout dir."</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout dir. sa RTL sa lahat ng lokal"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Ipakita paggamit ng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay ng screen pakita paggamit ngayon ng CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Ipilit ang pag-render ng GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Mag-tap at Magbayad"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Itanong palagi"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Itakda bilang iyong kagustuhan?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Mga Paghihigpit"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Alisin ang paghihigpit"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Palitan ang PIN"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e705105..5d5e99a 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Orta"</item>
     <item msgid="2372711992605524591">"Uzun"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Varsayılan"</item>
+    <item msgid="1016452621833735880">"Sans Serif"</item>
+    <item msgid="2496277987934654454">"Sans Serif dar"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Sabit boşluklu"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Çok küçük"</item>
+    <item msgid="6781094565687692782">"Küçük"</item>
+    <item msgid="8222123259497646551">"Normal"</item>
+    <item msgid="5813217276778560466">"Büyük"</item>
+    <item msgid="9044232017390975191">"Çok büyük"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Hiçbiri"</item>
+    <item msgid="1352974708028506778">"Dış çizgi"</item>
+    <item msgid="5850876295428722675">"Gölge"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"%25"</item>
+    <item msgid="2367156416247936773">"%50"</item>
+    <item msgid="5395560410107149298">"%75"</item>
+    <item msgid="8342334626783983353">"%100"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Beyaz üzerine siyah"</item>
+    <item msgid="1770533843436933500">"Siyah üzerine beyaz"</item>
+    <item msgid="1309255027325660115">"Siyah üzerine sarı"</item>
+    <item msgid="2985943780939258562">"Mavi üzerine sarı"</item>
+    <item msgid="7520438652121629055">"Özel"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Asla izin verme"</item>
     <item msgid="1417929597727989746">"Her zaman izin ver"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"normal"</item>
+    <item msgid="4517779899383204000">"orta"</item>
+    <item msgid="406385694840950802">"düşük"</item>
+    <item msgid="4212263919458209842">"kritik düzeyde düşük"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c26136a..053dae6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Telefon defteri isteği"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s, kişilerinize ve çağrı geçmişinize erişmek istiyor. %2$s uygulamasına erişim izni verilsin mi?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Tekrar sorma"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Tekrar sorma"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"İleti isteği"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s, iletilerinize erişmek istiyor. %2$s için erişim izni veriyor musunuz?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Bölgesel (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksek doğruluk"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pil tasarrufu"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Yalnızca cihaz sensörleri"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Konum hizmetleri"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Konumu yaklaşık olarak bulmak için GPS, Kablosuz ve mobil ağları kullanın"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Konumu yaklaşık olarak bulmak için Kablosuz ve mobil ağları kullanın"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Konumunuzu tam olarak bulmak için GPS\'yi kullanın"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Kablosuz ve mobil ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Konum, Kablosuz tarafından belirlendi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Kilit açma PIN\'ini değiştir"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onayla"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tekrar deneyin:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Kilit açma deseni çiz:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kilit açma deseni çiz"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yardım için Menü\'ye basın."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bittiğinde parmağınızı kaldırın."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Yeniden deneyin:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Desen kaydedildi."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Doğrulamak için deseni yeniden çiz:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Yeni kilit açma deseniniz:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Bitirdiğinizde parmağınızı kaldırın"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Tekrar deneyin."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Desen kaydedildi"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Doğrulamak için deseni yeniden çizin"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Yeni kilit açma deseniniz"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Onayla"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Yeniden çiz"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Tekrar Dene"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu işlem şunlar için tüm tercihleri sıfırlayacaktır:\n\n "<li>"Devre dışı bırakılan uygulamalar"</li>\n" "<li>"Devre dışı bırakılan uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan veri kısıtlamaları"</li>\n" "<li>"Tüm izin kısıtlamaları"</li>\n\n" Hiçbir uygulama verisini kaybetmeyeceksiniz."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Uygulamaları sıfırla"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Erişebilirlik ayarları"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Altyazılar"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Büyüteç hareketleri"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Açık"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kapalı"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Önizle"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Standart seçenekler"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Dil"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Metin boyutu"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Altyazı stili"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Özel seçenekler"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Arka plan rengi"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Arka plan şeffaflığı"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Metin rengi"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Kenar rengi"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Kenar türü"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Yazı tipi ailesi"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Altyazılar şöyle görünecek:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Varsayılan"</string>
+    <string name="color_none" msgid="3475640044925814795">"Hiçbiri"</string>
+    <string name="color_white" msgid="8045195170201590239">"Beyaz"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Gri"</string>
+    <string name="color_black" msgid="7517353520909872561">"Siyah"</string>
+    <string name="color_red" msgid="4949354900304125428">"Kırmızı"</string>
+    <string name="color_green" msgid="5537717328428845841">"Yeşil"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Mavi"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Camgöbeği"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Sarı"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Macenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"İşlemlerinizi izleyin"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Yenile"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android İS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medya sunucusu"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"İşlem İstatistikleri"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Meraklısı için, çalışan işlemlerle ilgili istatistikler"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Bellek kullanımı"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Başka bir motor seç"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Bu konuşma sentezi motoru, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil konuşulan tüm metni toplayabilir. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorundan gelmektedir. Bu konuşma sentezi motorunun kullanımı etkinleştirilsin mi?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu dil, metin-konuşma çıktısı için bir ağ bağlantısı gerektirir."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Bu bir konuşma sentezi örneğidir"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Varsayılan dil durumu"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> tamamen destekleniyor"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> ağ bağlantısı gerektiriyor"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> desteklenmiyor"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Denetleniyor..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorlar"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ayarları"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> etkinleştirildi"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"kapatılıyor"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Kablosuz"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Konum"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Senkronizasyon"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Parlaklık <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatik"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Klip sınırlarını, kenar boşluklarını vb. göster"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Sağdan sola düzenini zorla"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tüm yerel ayarlar için sağdan sola ekran düzenini zorlar"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mevcut CPU kullanımını gösteren yer paylaşımı"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU oluşturmayı zorla"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Dokun ve Öde"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Her zaman sor"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Tercihiniz olarak ayarlansın mı?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Kısıtlamalar"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Kısıtlamaları kaldır"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN\'i değiştir"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index fda29aa..a353e47 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Середня"</item>
     <item msgid="2372711992605524591">"Довга"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"За умовчанням"</item>
+    <item msgid="1016452621833735880">"Sans-Serif"</item>
+    <item msgid="2496277987934654454">"Sans-Serif стиснений"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Однакової ширини"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Дуже малий"</item>
+    <item msgid="6781094565687692782">"Малий"</item>
+    <item msgid="8222123259497646551">"Звичайний"</item>
+    <item msgid="5813217276778560466">"Великий"</item>
+    <item msgid="9044232017390975191">"Дуже великий"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Немає"</item>
+    <item msgid="1352974708028506778">"Контур"</item>
+    <item msgid="5850876295428722675">"Додати тінь"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Чорний на білому"</item>
+    <item msgid="1770533843436933500">"Білий на чорному"</item>
+    <item msgid="1309255027325660115">"Жовтий на чорному"</item>
+    <item msgid="2985943780939258562">"Жовтий на синьому"</item>
+    <item msgid="7520438652121629055">"Спеціальний"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -381,11 +413,11 @@
   <string-array name="overlay_display_devices_entries">
     <item msgid="1606809880904982133">"Немає"</item>
     <item msgid="688482401508173818">"720x480 mdpi"</item>
-    <item msgid="6027541158956821790">"720x480 mdpi (фіксована)"</item>
+    <item msgid="6027541158956821790">"720x480 mdpi (безпечний)"</item>
     <item msgid="8181151155909301030">"1280x720 tvdpi"</item>
-    <item msgid="2920655562462493148">"1280x720 tvdpi (фіксована)"</item>
+    <item msgid="2920655562462493148">"1280x720 tvdpi (безпечний)"</item>
     <item msgid="8910371271391940941">"1920x1080 xhdpi"</item>
-    <item msgid="4171600481380800455">"1920x1080 xhdpi (фіксована)"</item>
+    <item msgid="4171600481380800455">"1920x1080 xhdpi (безпечний)"</item>
     <item msgid="1937752114395156918">"1280x720 tvdpi та 1920x1080 xhdpi"</item>
   </string-array>
   <string-array name="enable_opengl_traces_entries">
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Ніколи не дозволяти"</item>
     <item msgid="1417929597727989746">"Завжди дозволяти"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"звичайний"</item>
+    <item msgid="4517779899383204000">"посередній"</item>
+    <item msgid="406385694840950802">"низький"</item>
+    <item msgid="4212263919458209842">"критичний"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7be5151..da05b61 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Запит на телефонну книгу"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s хоче отримати доступ до ваших контактів й історії викликів. Надати %2$s доступ?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Не запитувати знову"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Не запитувати знову"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Запит на доступ до повідомлень"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s хоче отримати доступ до ваших повідомлень. Надати %2$s доступ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Налаштування дати та часу"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Регіональний (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заощадження заряду акумулятора"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Лише датчики пристрою"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити про місцезнах."</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Надсилання геоданих вимкнено"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити геоданих"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Служби локації"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Режим місцезнаходження"</string>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Використ. GPS, Wi‑Fi і моб.мережі для прибл. місцезнах."</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Використ. Wi‑Fi і моб.мережі для прибл. місцезнах."</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Використ. GPS для точн. місцезнах."</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>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Використовувати GPS для визначення місцезнаходження"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Отримання…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Місцезнах. Wi-Fi і моб. мережі"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -1042,13 +1049,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Змініть PIN розблок."</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="2063630508212535241">"Намалюйте ключ розблокування:"</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="4622772178078818425">"По заверш. відпуст. палець."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Підключ. принаймні <xliff:g id="NUMBER">%d</xliff:g> точок. Спроб. ще:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Ключ записано."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Ще раз намал. ключ для підтвердж:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Ваш новий ключ розблокув.:"</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_confirm_button_text" msgid="1128204343957002841">"Підтверд."</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Перемал."</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор"</string>
@@ -1116,8 +1123,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налашт-ня програм"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Буде скинуто всі налаштування для:\n\n "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"програм за умовчанням для виконання дій"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n" "<li>"усіх обмежень щодо дозволів"</li>\n\n" Жодні дані програм не буде втрачено."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути програми"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
@@ -1356,6 +1362,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налаштування доступності"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Служби"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Субтитри"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жести збільшення"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Якщо цю функцію ввімкнено, масштаб можна змінювати, тричі торкнувшись екрана.\n\nУ збільшеному масштабі можна:\n"<ul><li>"панорамувати – проведіть принаймні двома пальцями по екрану;"</li>\n<li>"налаштовувати рівень масштабування – стисніть або розведіть принаймні два пальці."</li></ul>\n\n"Можна також тимчасово збільшувати вміст під пальцем – тричі торкніться й утримуйте. У такому збільшеному стані можна досліджувати різні частини екрана, пересуваючи палець. Підніміть палець, щоб повернутися до попереднього стану.\n\nПримітка. Потрійний дотик для збільшення працює всюди, окрім клавіатури та панелі навігації."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Ярлик доступності"</string>
@@ -1372,6 +1379,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налаштування"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Увімкнено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Вимкнено"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Переглянути"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Стандартні параметри"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Мова"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Розмір тексту"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Стиль субтитрів"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Спеціальні параметри"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Колір фону"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Прозорість фону"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Колір тексту"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Колір контуру"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Тип контуру"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Сім’я шрифтів"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитри виглядатимуть так:"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Аа"</string>
+    <string name="locale_default" msgid="2593883646136326969">"За умовчанням"</string>
+    <string name="color_none" msgid="3475640044925814795">"Немає"</string>
+    <string name="color_white" msgid="8045195170201590239">"Білий"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Сірий"</string>
+    <string name="color_black" msgid="7517353520909872561">"Чорний"</string>
+    <string name="color_red" msgid="4949354900304125428">"Червоний"</string>
+    <string name="color_green" msgid="5537717328428845841">"Зелений"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Синій"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Блакитний"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Жовтий"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Пурпуровий"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Спостерігати за вашими діями"</string>
@@ -1469,6 +1501,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Оновити"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Медіа-сервер"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика про процеси"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Статистика про запущені процеси"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Використання пам’яті"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1539,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Вибрати іншу систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ця система синтезу мовлення може збирати всі відтворювані тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Вона походить від системи <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Увімкнути використання цієї системи синтезу мовлення?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Для виходу синтезу мовлення цією мовою потрібно мати з’єднання з Інтернетом."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Це приклад синтезу мовлення"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Статус мови за умовчанням"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g>: підтримується повністю"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g>: потрібне з’єднання з мережею"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g>: не підтримується"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Перевірка…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Системи"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налашт-ня <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> увімкнено"</string>
@@ -1538,7 +1571,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"вимкнення"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Місцезнаходження"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронізація"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Яскравість <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"авто"</string>
@@ -1722,6 +1755,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Увімк. трасування OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показувати межі роликів, поля тощо"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Макет письма справа наліво"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Застосовувати макет письма справа наліво для всіх мов"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Примусова візуалізація GPU"</string>
@@ -1914,6 +1949,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Натиснути й оплатити"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Запитувати щоразу"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Установити як вибраний?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Обмеження"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Зняти обмеження"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змінити PIN-код"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 552da37..1084bcc 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -279,7 +279,7 @@
     <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
     <item msgid="2029227495214047094">"không khóa màn hình"</item>
     <item msgid="26109888160231211">"giám sát vị trí"</item>
-    <item msgid="5753382310468855812">"theo dõi vị trí có hiệu suất cao"</item>
+    <item msgid="5753382310468855812">"theo dõi vị trí dùng điện năng cao"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vị trí"</item>
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Trung bình"</item>
     <item msgid="2372711992605524591">"Dài"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Mặc định"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif mật độ cao"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"Đơn cách"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Rất nhỏ"</item>
+    <item msgid="6781094565687692782">"Nhỏ"</item>
+    <item msgid="8222123259497646551">"Bình thường"</item>
+    <item msgid="5813217276778560466">"Lớn"</item>
+    <item msgid="9044232017390975191">"Rất lớn"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Không có"</item>
+    <item msgid="1352974708028506778">"Viền ngoài"</item>
+    <item msgid="5850876295428722675">"Bóng đổ"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Chữ đen trên nền trắng"</item>
+    <item msgid="1770533843436933500">"Chữ trắng trên nền đen"</item>
+    <item msgid="1309255027325660115">"Chữ vàng trên nền đen"</item>
+    <item msgid="2985943780939258562">"Chữ vàng trên nền xanh lam"</item>
+    <item msgid="7520438652121629055">"Tùy chỉnh"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Không bao giờ cho phép"</item>
     <item msgid="1417929597727989746">"Luôn cho phép"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"bình thường"</item>
+    <item msgid="4517779899383204000">"vừa phải"</item>
+    <item msgid="406385694840950802">"thấp"</item>
+    <item msgid="4212263919458209842">"cực thấp"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 424d3c7..6936f04 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Bạn có muốn kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" không?"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Yêu cầu danh bạ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s muốn truy cập danh bạ và lịch sử cuộc gọi của bạn. Cấp quyền truy cập cho %2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Không hỏi lại"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Không hỏi lại"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Yêu cầu cấp quyền truy cập tin nhắn"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s muốn truy cập tin nhắn của bạn. Bạn có muốn cấp quyền truy cập cho %2$s không?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Cài đặt ngày &amp; giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Khu vực (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Độ chính xác cao"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Tiết kiệm pin"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Chỉ cảm biến thiết bị"</string>
+    <string name="location_mode_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_category_location_services" msgid="7437150886946685979">"Dịch vụ vị trí"</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>
-    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Dùng mạng GPS, WiFi, d.đ ư.đoán VT"</string>
-    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Dùng mạng WiFi &amp; d.đ ư.đoán VT"</string>
+    <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Dùng mạng GPS, WiFi, di động để đoán v.trí"</string>
+    <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Dùng mạng WiFi &amp; di động để đoán v.trí"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Dùng GPS để xác định vị trí"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Vị trí Wi‑Fi và mạng di động"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vị trí được xác định bằng Wi‑Fi"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Thay đổi mã PIN mở khóa"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Thử lại:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Vẽ hình mở khóa:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Vẽ hình mở khóa"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Trình đơn để được trợ giúp."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Thả ngón tay khi xong."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kết nối ít nhất <xliff:g id="NUMBER">%d</xliff:g> điểm. Hãy thử lại:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Hình đã được ghi lại."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Vẽ lại hình để xác nhận:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Hình mở khóa mới của bạn:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Thả ngón tay khi xong"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Kết nối ít nhất <xliff:g id="NUMBER">%d</xliff:g> điểm. Hãy thử lại."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Đã ghi hình"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Vẽ lại hình để xác nhận"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Hình mở khóa mới của bạn"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Xác nhận"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Vẽ lại"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Thử lại"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng bị tắt"</li>\n" "<li>"Thông báo ứng dụng bị tắt"</li>\n" "<li>"Ứng dụng mặc định cho các tác vụ"</li>\n" "<li>"Giới hạn dữ liệu nền cho ứng dụng"</li>\n" "<li>"Bất kỳ giới hạn về quyền nào"</li>\n\n" Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Đặt lại ứng dụng"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt hỗ trợ truy cập"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dịch vụ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Thao tác thu phóng"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Khi tính năng này được bật, bạn có thể phóng to và thu nhỏ bằng cách chạm ba lần vào màn hình.\n\nTrong khi phóng to, bạn có thể:\n"<ul><li>"Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."</li>\n<li>"Điều chỉnh mức thu phóng: Chụm hai hoặc nhiều ngón tay với nhau hoặc tách chúng ra."</li></ul>\n\n"Bạn cũng có thể tạm thời thu phóng các mục bên dưới ngón tay bạn bằng cách nhấn ba lần và giữ. Ở trạng thái thu phóng này, bạn có thể kéo ngón tay để khám phá các phần khác nhau của màn hình. Thả ngón tay để trở về trạng thái trước.\n\nLưu ý: Nhấn ba lần để thu phóng toàn bộ trừ bàn phím và thanh điều hướng."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Cài đặt"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Bật"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Tắt"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Xem trước"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Tùy chọn chuẩn"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Ngôn ngữ"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Kích thước văn bản"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Kiểu phụ đề"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Tùy chọn tùy chỉnh"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Màu nền"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Độ mờ của nền"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Màu văn bản"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Màu viền"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Loại viền"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"Họ phông chữ"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Phụ đề sẽ trông như thế này"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Mặc định"</string>
+    <string name="color_none" msgid="3475640044925814795">"Không có"</string>
+    <string name="color_white" msgid="8045195170201590239">"Trắng"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Xám"</string>
+    <string name="color_black" msgid="7517353520909872561">"Đen"</string>
+    <string name="color_red" msgid="4949354900304125428">"Đỏ"</string>
+    <string name="color_green" msgid="5537717328428845841">"Xanh lục"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Lam"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"Lục lam"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Vàng"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"Đỏ tươi"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Theo dõi tác vụ của bạn"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Làm mới"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Hệ điều hành Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Máy chủ phương tiện"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Số liệu thống kê về quy trình"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Số liệu thống kê hàng loạt về các quy trình đang chạy"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Mức sử dụng bộ nhớ"</string>
+    <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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chọn công cụ khác"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Công cụ tổng hợp tiếng nói này có thể thu thập tất cả nội dụng sẽ được nói, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Công cụ này xuất phát từ công cụ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Cho phép sử dụng công cụ tổng hợp tiếng nói này?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Ngôn ngữ này yêu cầu phải có kết nối mạng hoạt động để có thể phát âm thanh được chuyển từ văn bản sang giọng nói."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Đây là một ví dụ về tổng hợp tiếng nói"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Trạng thái ngôn ngữ mặc định"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> được hỗ trợ đầy đủ"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> yêu cầu kết nối mạng"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> không được hỗ trợ"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Đang kiểm tra..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Công cụ"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Cài đặt <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> đã được bật"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"đang tắt"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Vị trí"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Đồng bộ hóa"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Độ sáng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"tự động"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị viền đoạn video, lề, v.v.."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Buộc hướng bố cục RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Buộc hướng bố cục màn hình RTL cho tất cả ngôn ngữ"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Nhấn và thanh toán"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Luôn hỏi"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Đặt làm tùy chọn của bạn?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Hạn chế"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Xóa các hạn chế"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Thay đổi PIN"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 34e21bb..d653ffd 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"长"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"默认"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"等宽"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"超小"</item>
+    <item msgid="6781094565687692782">"小"</item>
+    <item msgid="8222123259497646551">"正常"</item>
+    <item msgid="5813217276778560466">"大"</item>
+    <item msgid="9044232017390975191">"超大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"无"</item>
+    <item msgid="1352974708028506778">"轮廓"</item>
+    <item msgid="5850876295428722675">"阴影"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"白底黑字"</item>
+    <item msgid="1770533843436933500">"黑底白字"</item>
+    <item msgid="1309255027325660115">"黑底黄字"</item>
+    <item msgid="2985943780939258562">"蓝底黄字"</item>
+    <item msgid="7520438652121629055">"自定义"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"永不允许"</item>
     <item msgid="1417929597727989746">"始终允许"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"一般"</item>
+    <item msgid="4517779899383204000">"中"</item>
+    <item msgid="406385694840950802">"低"</item>
+    <item msgid="4212263919458209842">"严重不足"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index dcaa464..c25d841 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗？"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"电话簿请求"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s想访问您的联系人信息和通话记录。要向%2$s授予访问权限吗？"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再询问"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"下次不再询问"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"消息请求"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"“%1$s”想要查看您的消息。要向“%2$s”授予权限吗？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"所在区域 (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -311,7 +314,7 @@
     <string name="user_info_settings_title" msgid="1195015434996724736">"用户信息"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在锁定屏幕上显示个人资料信息"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
@@ -986,15 +989,20 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高度准确"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"节省电池电量"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"仅使用设备传感器"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置请求"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"位置服务"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"位置模式"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息服务已关闭"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"位置信息服务"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"使用 GPS、WLAN 和移动网络估测位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"使用 WLAN 和移动网络估测位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 定位您的位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 精确定位您的位置"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"WLAN 和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用 Google 位置服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过 WLAN 确定位置"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"更改解锁 PIN"</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="2063630508212535241">"绘制解锁图案："</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"绘制解锁图案"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成后松开手指。"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"至少连接 <xliff:g id="NUMBER">%d</xliff:g> 个点，请重试："</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"图案已记录。"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"再次绘制图案进行确认："</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"您的新解锁图案："</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_confirm_button_text" msgid="1128204343957002841">"确认"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"重新绘制"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"重试"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"这将重置以下所有偏好设置：\n\n "<li>"停用的应用"</li>\n" "<li>"停用的应用通知"</li>\n" "<li>"执行操作的默认应用"</li>\n" "<li>"应用的后台数据限制"</li>\n" "<li>"任何权限限制"</li>\n\n" 您将不会丢失任何应用数据。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手势"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"启用此功能后，您可以通过点按屏幕三次进行缩放。\n\n放大时，您可以：\n"<ul><li>"平移：在屏幕上拖动两根或更多根手指。"</li>\n<li>"调整缩放级别：开合两根或更多根手指。"</li></ul>\n\n"同时，您还可以通过点按三次并按住的方法来暂时性地放大手指触摸到的内容。在此放大状态下，您可以拖动手指查看屏幕上的各个部分。松开手指即可返回之前的状态。\n\n请注意：点按屏幕三次进行放大的方法适用于除键盘和导航栏外的所有情况。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"辅助功能快捷方式"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"设置"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"开启"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"关闭"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"预览"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"标准选项"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"语言"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"文字大小"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"字幕样式"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"自定义选项"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"背景颜色"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"背景不透明度"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"文字颜色"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"边缘颜色"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"边缘类型"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"字体系列"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外观如下"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"默认"</string>
+    <string name="color_none" msgid="3475640044925814795">"无"</string>
+    <string name="color_white" msgid="8045195170201590239">"白色"</string>
+    <string name="color_gray" msgid="9192312087142726313">"灰色"</string>
+    <string name="color_black" msgid="7517353520909872561">"黑色"</string>
+    <string name="color_red" msgid="4949354900304125428">"红色"</string>
+    <string name="color_green" msgid="5537717328428845841">"绿色"</string>
+    <string name="color_blue" msgid="7731984529016953223">"蓝色"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"青色"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"黄色"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"紫红色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"监测您的操作"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"刷新"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"进程统计信息"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"运行中进程的相关技术统计信息"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"内存用量"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"选择其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息，包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎？"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"您必须连接到网络才能使用文字转语音功能输出这种语言。"</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"这是语音合成示例"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"默认语言状态"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"完全支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"只有在连接到网络的情况下，才支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"不支持<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"正在检查…"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>设置"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已启用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"正在关闭"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"蓝牙"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"位置信息"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同步"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自动"</string>
@@ -1722,6 +1756,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"强制使用从右到左的布局方向"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"强制将所有语言区域的屏幕布局方向改为从右到左"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
@@ -1914,6 +1950,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"触碰付款"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都询问"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"要设为您的偏好设置吗？"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"取消限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 码"</string>
@@ -1936,7 +1975,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"允许在平板电脑与其他设备触碰时交换数据"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"允许在手机与其他设备触碰时交换数据"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"位置"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"位置信息"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"允许应用使用您的位置信息"</string>
     <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
     <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 0f146ff..080cd2b 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"預設"</item>
+    <item msgid="1016452621833735880">"Sans-serif"</item>
+    <item msgid="2496277987934654454">"Sans-serif condensed"</item>
+    <item msgid="4406003087391086325">"Serif"</item>
+    <item msgid="1558362802170124073">"等寬"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"非常小"</item>
+    <item msgid="6781094565687692782">"小"</item>
+    <item msgid="8222123259497646551">"普通"</item>
+    <item msgid="5813217276778560466">"大"</item>
+    <item msgid="9044232017390975191">"非常大"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"無"</item>
+    <item msgid="1352974708028506778">"外框"</item>
+    <item msgid="5850876295428722675">"陰影"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"白底黑字"</item>
+    <item msgid="1770533843436933500">"黑底白字"</item>
+    <item msgid="1309255027325660115">"黑底黃字"</item>
+    <item msgid="2985943780939258562">"藍底黃字"</item>
+    <item msgid="7520438652121629055">"自訂"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"Dalvik"</item>
     <item msgid="8978402910750533864">"ART"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"一律不允許"</item>
     <item msgid="1417929597727989746">"一律允許"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"一般"</item>
+    <item msgid="4517779899383204000">"中"</item>
+    <item msgid="406385694840950802">"低"</item>
+    <item msgid="4212263919458209842">"嚴重不足"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 461d61e..b227010 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話簿要求"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s 想存取您的通訊錄和通話紀錄。要將存取權授予 %2$s 嗎？"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"不要再詢問"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"不要再詢問"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"訊息要求"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取您的訊息。要將存取權授予 %2$s 嗎？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"本地 (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -989,12 +992,17 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約耗電量"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"僅限裝置感應器"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"定位服務已關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"定位服務"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"使用 GPS、Wi-Fi 和行動網路預估位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"使用 Wi-Fi 和行動網路預估位置"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"使用 GPS 定出您的精確位置"</string>
+    <!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
+    <skip />
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和行動網路位置"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
@@ -1042,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"變更解鎖 PIN"</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="2063630508212535241">"畫出解鎖圖形："</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"畫出解鎖圖形"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"請按 [Menu] 以取得說明。"</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成時請移開手指。"</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"請連接至少 <xliff:g id="NUMBER">%d</xliff:g> 點。再試一次："</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"圖形已記錄。"</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"再次畫出圖形以確認："</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"新的解鎖圖形："</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_confirm_button_text" msgid="1128204343957002841">"確認"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"重畫"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"重試"</string>
@@ -1116,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"這會重設下列項目的所有偏好設定：\n\n "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式的背景資料限制"</li>\n" "<li>"任何權限限制"</li>\n\n" 您不會遺失任何應用程式資料。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
@@ -1356,6 +1363,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"協助工具設定"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服務"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手勢"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"啟用這項功能時，只要在螢幕上輕按三下即可縮放。\n\n放大時，您可以：\n"<ul><li>"平移：使用兩指或多指在螢幕上拖曳。"</li>\n<li>"調整縮放等級：使用兩指或多指往內撥或往外撥。"</li></ul>\n\n"此外，您只要輕按三下並持續按住，即可暫時放大手指所觸畫面。在這種放大狀態下，您可以使用手指拖曳，藉此探索畫面的不同部分。手指離開後，畫面隨即恢復原先的狀態。\n\n注意：除了鍵盤與導覽列部分以外，其他地方均適用輕按三下以放大畫面的做法。"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"協助工具捷徑"</string>
@@ -1372,6 +1380,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"開啟"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"關閉"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"預覽"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"標準選項"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"語言"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"文字大小"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"字幕樣式"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"自訂選項"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"背景顏色"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"背景透明度"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"文字顏色"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"邊緣顏色"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"邊緣類型"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"字型系列"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"字幕外觀如下"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"預設"</string>
+    <string name="color_none" msgid="3475640044925814795">"無"</string>
+    <string name="color_white" msgid="8045195170201590239">"白色"</string>
+    <string name="color_gray" msgid="9192312087142726313">"灰色"</string>
+    <string name="color_black" msgid="7517353520909872561">"黑色"</string>
+    <string name="color_red" msgid="4949354900304125428">"紅色"</string>
+    <string name="color_green" msgid="5537717328428845841">"綠色"</string>
+    <string name="color_blue" msgid="7731984529016953223">"藍色"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"青色"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"黃色"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"記錄您的操作行為"</string>
@@ -1469,6 +1502,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"重新整理"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"處理程序統計資料"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"執行中處理程序的相關完善統計資料"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"記憶體用量"</string>
+    <string name="process_stats_total_duration" msgid="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="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>
@@ -1502,16 +1540,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"選擇其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此語音合成引擎可能會收集您輸入的所有語音，包括密碼和信用卡號等個人資料。此引擎來自「<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>」引擎，是否要使用此語音合成引擎？"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"您必須連上網路才能使用文字轉語音輸出功能。"</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"您目前聽到的是我們的語音合成範例"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"預設語言狀態"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"完整支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"需要網路連線才支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"不支援<xliff:g id="LOCALE">%1$s</xliff:g>"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"檢查中..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已啟用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1538,7 +1572,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"關閉中"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"藍牙"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"定位"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同步處理"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
@@ -1726,6 +1760,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面配置界限"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等。"</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左版面配置方向"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上方顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
@@ -1918,6 +1954,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"隨點即付"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"每次都詢問"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"設為您的偏好設定？"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 2a3ad24..c07d4ea 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -331,6 +331,38 @@
     <item msgid="2560532955514699713">"Okulingene"</item>
     <item msgid="2372711992605524591">"Kude"</item>
   </string-array>
+  <string-array name="captioning_typeface_selector_titles">
+    <item msgid="1319652728542138112">"Okuzenzakalelayo"</item>
+    <item msgid="1016452621833735880">"I-Sans Serif"</item>
+    <item msgid="2496277987934654454">"I-Sans-serif ejiyisiwe"</item>
+    <item msgid="4406003087391086325">"I-Serif"</item>
+    <item msgid="1558362802170124073">"I-Monospace"</item>
+  </string-array>
+  <string-array name="captioning_font_size_selector_titles">
+    <item msgid="4800919809575254054">"Kuncane kakhulu"</item>
+    <item msgid="6781094565687692782">"Kuncane"</item>
+    <item msgid="8222123259497646551">"Jwayelekile"</item>
+    <item msgid="5813217276778560466">"Kukhulu"</item>
+    <item msgid="9044232017390975191">"Kukhulu kakhulu"</item>
+  </string-array>
+  <string-array name="captioning_edge_type_selector_titles">
+    <item msgid="6022616153255438487">"Lutho"</item>
+    <item msgid="1352974708028506778">"Uhlaka"</item>
+    <item msgid="5850876295428722675">"Isithunzi sefu"</item>
+  </string-array>
+  <string-array name="captioning_opacity_selector_titles">
+    <item msgid="7622491218136667566">"25%"</item>
+    <item msgid="2367156416247936773">"50%"</item>
+    <item msgid="5395560410107149298">"75%"</item>
+    <item msgid="8342334626783983353">"100%"</item>
+  </string-array>
+  <string-array name="captioning_preset_selector_titles">
+    <item msgid="4449370095159630210">"Okumnyama kokumhlophe"</item>
+    <item msgid="1770533843436933500">"Okumhlophe kokumnyama"</item>
+    <item msgid="1309255027325660115">"Okuliphuzi kokumnyama"</item>
+    <item msgid="2985943780939258562">"Okuliphuzi kokuluhlaza"</item>
+    <item msgid="7520438652121629055">"Ngokwezifiso"</item>
+  </string-array>
   <string-array name="select_runtime_titles">
     <item msgid="3574453009229338122">"I-Dalvik"</item>
     <item msgid="8978402910750533864">"UBUCIKO"</item>
@@ -439,4 +471,10 @@
     <item msgid="5077768429488260031">"Ungavumeli"</item>
     <item msgid="1417929597727989746">"Vumela njalo?"</item>
   </string-array>
+  <string-array name="ram_states">
+    <item msgid="7088762389498381203">"jwayelekile"</item>
+    <item msgid="4517779899383204000">"maphakathi"</item>
+    <item msgid="406385694840950802">"phansi"</item>
+    <item msgid="4212263919458209842">"bucayi"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c32847e..480d79d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -165,7 +165,10 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Uyafuna ukuxhuma ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"Isicelo sebhuku lefoni"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"I-%1$s ifuna ukufinyelela kothintana nabo nomlando wekholi. Nikeza ukufinyelela ku-%2$s?"</string>
+    <string name="bluetooth_remember_choice" msgid="6198284561603824931">"Ungabuzi futhi"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Ungabuzi futhi"</string>
+    <string name="bluetooth_map_request" msgid="1541931183213124878">"Isicelo somlayezo"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"I-%1$s ifuna ukufinyelela kumilayezo yakho. Nikeza ukufinyelela ku-%2$s?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Usuku nezilungiselelo zesikhathi"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Okwesifunda (<xliff:g id="DATE">%s</xliff:g>)"</string>
@@ -990,12 +993,16 @@
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ukulunga okuphezulu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhetri"</string>
     <string name="location_mode_sensors_only_title" msgid="5960338820984635411">"Izinzwa zedivayisi kuphela"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"Indawo ivaliwe"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Izicelo zendawo zakamuva"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Amasevisi wendawo"</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>
     <string name="location_mode_high_accuracy_description" msgid="8640231702873607191">"Sebenzisa i-GPS, Wi‑Fi namanethiwekhi weselula ukulinganisa indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="7110846007772128971">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukuze ulinganise indawo"</string>
     <string name="location_mode_sensors_only_description" msgid="3103917665724654860">"Sebenzisa i-GPS ukuze ukhombe indawo yakho"</string>
+    <string name="location_loading_injected_setting" msgid="4238574500081976654">"Iyathola…"</string>
     <string name="location_network_based" msgid="9134175479520582215">"I-Wi-Fi nendawo yenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Indawo etholwe i-Wi-Fi"</string>
@@ -1043,13 +1050,13 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Shintsha ukuvula i-PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Qinisekisa iphathini egciniwe"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zama futhi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dweba iphethini yokuvula"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dweba iphathini yokuvula"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Dedela umunwe uma usuqedile."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Xhuma okungenani <xliff:g id="NUMBER">%d</xliff:g> amachashazi. Zama futhi:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Iphathini irekhodiwe."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Dweba iphathini futhi ukuqinisekisa:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Iphethini yakho entsha yokuvula:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Dedela umunwe uma usuqedile"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Xhuma okungenani amachashazi angu-<xliff:g id="NUMBER">%d</xliff:g>. Zama futhi."</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Iphethini iqoshiwe"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Dweba iphethini futhi ukuze uqinisekise"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Iphethini yakho entsha yokuvula"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Qinisekisa"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Dweba kabusha"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Zama futhi"</string>
@@ -1117,8 +1124,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
-    <!-- no translation found for reset_app_preferences_desc (4822447731869201512) -->
-    <skip />
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Lokhu kuzosetha kabusha konke okuncamelayo kwe-:\n\n "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza ezizenzakalelayo zezenzo"</li>\n" "<li>"Imikhawulo yedatha yangemuva yezinhlelo zokusebenza"</li>\n" "<li>"Noma yimiphi imikhawulo yemvume"</li>\n\n" Ngeke uze ulahlekelwe noma iyiphi idatha yohlelo lokusebenza."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setha kabusha izinhlelo zokusebenza"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
     <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
@@ -1363,6 +1369,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Izilungiselelo zokufinyelela"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Amasevisi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Isistimu"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Amazwibela"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ukuthinta kokukhulisa"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Uma lesi sici sivuliwe, ungasondeza futhi unciphise ngokucindezela kathathu isikrini.\n\nNgenkathi kusondeziwe, ungahle:\n"<ul><li>"Uyise emaceleni: Hudula iminwe emibili noma eminingi esikrinini."</li>\n<li>"Lungisa ileveli zokusondeza: Cindezela iminwe emibili noma eminingi noma uyihlukanise."</li></ul>\n\n"Futhi ungahle ukhulise okwesikhashana okungaphandi komunwe wakho ngokucindezela kathathu futhi ubambe. Kuleli zinga lokukhulisa, ngahudula umunwe wakho ukuze uhlole izingxenye ezahlukahlukene zesikrini. Phakamisa umunwe wakho ukuze ubuyele esimeni sangaphambilini.\n\nQaphela: Ukucindezela kathathu kusebenza noma ikuphi ngaphandle kwekhibhodi nebha lokuzula."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Isinqamuleli sokufinyelela"</string>
@@ -1379,6 +1386,31 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Vuliwe"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kucishile"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"Buka kuqala"</string>
+    <string name="captioning_standard_options_title" msgid="3284211791180335844">"Izinketho ezijwayelekile"</string>
+    <string name="captioning_locale" msgid="4559155661018823503">"Ulimi"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"Usayizi wombhalo"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"Isitayela segama-ngcazo"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"Izinketho ezingokwezifiso"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"Umbala ongemuva"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"Ukufiphala kwangemuva"</string>
+    <string name="captioning_foreground_color" msgid="85623486537640059">"Umbala wombhalo"</string>
+    <string name="captioning_edge_color" msgid="3670094753735263238">"Umbala wonqenqema"</string>
+    <string name="captioning_edge_type" msgid="5997247394951682154">"Uhlobo lonqenqema"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"I-Font Family"</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"Amazwibela azobukeka ngale ndlela"</string>
+    <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Okuzenzakalelayo"</string>
+    <string name="color_none" msgid="3475640044925814795">"Lutho"</string>
+    <string name="color_white" msgid="8045195170201590239">"Okumhlophe"</string>
+    <string name="color_gray" msgid="9192312087142726313">"Okumpunga"</string>
+    <string name="color_black" msgid="7517353520909872561">"Okumnyama"</string>
+    <string name="color_red" msgid="4949354900304125428">"Okubomvu"</string>
+    <string name="color_green" msgid="5537717328428845841">"Okuluhlaza okotshani"</string>
+    <string name="color_blue" msgid="7731984529016953223">"Okuluhlaza okwesibhakabhaka"</string>
+    <string name="color_cyan" msgid="7033027180641173211">"I-Cyan"</string>
+    <string name="color_yellow" msgid="9112680561610873529">"Okuliphuzi"</string>
+    <string name="color_magenta" msgid="5059212823607815549">"I-Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Qapha izenzo zakho"</string>
@@ -1476,6 +1508,11 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Qala kabusha"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"I-Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Iseva yemidiya"</string>
+    <string name="process_stats_summary_title" msgid="1144688045609771677">"Izibalo zenqubo"</string>
+    <string name="process_stats_summary" msgid="109387941605607762">"Izibalo ze-Geeky mayelana nezinqubo zokuqalisa"</string>
+    <string name="app_memory_use" msgid="7849258480392171939">"Ukusetshenziswa kwememori"</string>
+    <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="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>
@@ -1509,16 +1546,12 @@
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Khetha enye injini"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lenjini yokuqaphela amagama ingase ikwazi ukuqoqa wonke umbhalo ozokhulunywa, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kwinjini. Vumela ukusebenzisa lenjini yokuqaphela amagama?"</string>
     <string name="tts_engine_network_required" msgid="1190837151485314743">"Lolu limi ludinga ukuxhumana okusebenzayo kwenethiwekhi ekukhishweni kokuthunyelwe njengombhalo kunkulumo."</string>
-    <!-- no translation found for tts_default_sample_string (4040835213373086322) -->
-    <skip />
-    <!-- no translation found for tts_status_title (7268566550242584413) -->
-    <skip />
-    <!-- no translation found for tts_status_ok (1309762510278029765) -->
-    <skip />
-    <!-- no translation found for tts_status_requires_network (6042500821503226892) -->
-    <skip />
-    <!-- no translation found for tts_status_not_supported (4491154212762472495) -->
-    <skip />
+    <string name="tts_default_sample_string" msgid="4040835213373086322">"Lesi isibonelo sezwi"</string>
+    <string name="tts_status_title" msgid="7268566550242584413">"Isimo solimi oluzenzakalelayo"</string>
+    <string name="tts_status_ok" msgid="1309762510278029765">"I-<xliff:g id="LOCALE">%1$s</xliff:g> isekelwe ngokugcwele"</string>
+    <string name="tts_status_requires_network" msgid="6042500821503226892">"I-<xliff:g id="LOCALE">%1$s</xliff:g> idinga ukuxhumeka kwenethiwekhi"</string>
+    <string name="tts_status_not_supported" msgid="4491154212762472495">"I-<xliff:g id="LOCALE">%1$s</xliff:g> ayisekelwe"</string>
+    <string name="tts_status_checking" msgid="4983413982985913047">"Iyahlola..."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Izinjini"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> izilungiselelo"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ivunyelwe"</string>
@@ -1545,7 +1578,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Iyavala"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"I-Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"I-Bluetooth"</string>
-    <string name="gadget_gps" msgid="1558173602059236567">"i-GPS"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"Indawo"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Vumelanisa"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Ukukhanya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ngokuzenzakalela"</string>
@@ -1729,6 +1762,8 @@
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Nika amandla ukulandelwa komkhondo kwe-OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Khombisa imingcele yokumiseka"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Bonisa imikhawulo, imiphetho, njll, yesiqeshana."</string>
+    <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Phoqelela isikhombisi-ndlela sesakhiwo se-RTL"</string>
+    <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Phoqelela isikhombisi-ndlela sesikrini ku-RTL kuzo zonke izifunda"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Bonisa ukusebenzisa i-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
@@ -1921,6 +1956,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string>
+    <string name="nfc_payment_settings_title" msgid="4226098386809754689">"Thepha bese uyadlala"</string>
+    <string name="nfc_payment_ask" msgid="1061129391464251903">"Buza ngaso sonke isikhathi"</string>
+    <string name="nfc_payment_set_default" msgid="1583397933053078296">"Setha njengokuncanyelwayo kwakho?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Izinciphiso"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Susa izinciphiso"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Shintsha i-PIN"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 72a6b15..4498115 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1149,4 +1149,16 @@
         <item>Always allow</item>
     </string-array>
 
+    <!-- [CHAR LIMIT=30] Labels for memory states -->
+    <string-array name="ram_states">
+        <!-- Normal desired memory state. -->
+        <item>normal</item>
+        <!-- Moderate memory state, not as good as normal. -->
+        <item>moderate</item>
+        <!-- Memory is running low. -->
+        <item>low</item>
+        <!-- Memory is critical. -->
+        <item>critical</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b787c8d..6f242ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -355,8 +355,19 @@
     <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
 
     <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+    <string name="bluetooth_remember_choice">Don\'t ask again</string>
+    <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
     <string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
 
+    <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_request">"Message request"</string>
+
+    <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
+
+
+
+
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time settings</string>
     <!-- The title of the activity to pick a time zone. -->
@@ -2380,6 +2391,9 @@
     <string name="location_mode_battery_saving_description">Use Wi\u2011Fi and mobile networks to estimate location</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
     <string name="location_mode_sensors_only_description">Use GPS to pinpoint your location</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, temporary value to show as the status of a location
+         setting injected by an external app while the app is being queried for the actual value -->
+    <string name="location_loading_injected_setting">Retrieving…</string>
 
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; mobile network location</string>
@@ -3557,7 +3571,10 @@
     <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
     <string name="app_memory_use">Memory use</string>
     <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
-    <string name="process_stats_total_duration">Over <xliff:g id="time">%1$s</xliff:g></string>
+    <string name="process_stats_total_duration">Stats over <xliff:g id="time">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
+    <string name="process_stats_memory_status">Device memory is currently
+        <xliff:g id="memstate">%1$s</xliff:g></string>
 
     <!-- Voice input/output settings --><skip />
     <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index 74fb02e..8343595 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -23,6 +23,11 @@
     private float mYellowRatio;
     private float mGreenRatio;
 
+    private int mLeftColor = LEFT_COLOR;
+    private int mMiddleColor = MIDDLE_COLOR;
+    private int mRightColor = RIGHT_COLOR;
+
+    private boolean mShowIndicator = true;
     private boolean mShowingGreen;
 
     final Rect mRect = new Rect();
@@ -57,6 +62,20 @@
         invalidate();
     }
 
+    public void setColors(int red, int yellow, int green) {
+        mLeftColor = red;
+        mMiddleColor = yellow;
+        mRightColor = green;
+        updateIndicator();
+        invalidate();
+    }
+
+    public void setShowIndicator(boolean showIndicator) {
+        mShowIndicator = showIndicator;
+        updateIndicator();
+        invalidate();
+    }
+
     public void setShowingGreen(boolean showingGreen) {
         if (mShowingGreen != showingGreen) {
             mShowingGreen = showingGreen;
@@ -70,12 +89,15 @@
         if (off < 0) off = 0;
         mRect.top = off;
         mRect.bottom = getHeight();
+        if (!mShowIndicator) {
+            return;
+        }
         if (mShowingGreen) {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, RIGHT_COLOR&0xffffff, RIGHT_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mRightColor &0xffffff, mRightColor, Shader.TileMode.CLAMP));
         } else {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, MIDDLE_COLOR&0xffffff, MIDDLE_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mMiddleColor&0xffffff, mMiddleColor, Shader.TileMode.CLAMP));
         }
         mEdgeGradientPaint.setShader(new LinearGradient(
                 0, 0, 0, off/2, 0x00a0a0a0, 0xffa0a0a0, Shader.TileMode.CLAMP));
@@ -111,7 +133,7 @@
         if (mLastInterestingLeft != indicatorLeft || mLastInterestingRight != indicatorRight) {
             mColorPath.reset();
             mEdgePath.reset();
-            if (indicatorLeft < indicatorRight) {
+            if (mShowIndicator && indicatorLeft < indicatorRight) {
                 final int midTopY = mRect.top;
                 final int midBottomY = 0;
                 final int xoff = 2;
@@ -146,7 +168,7 @@
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(LEFT_COLOR);
+            mPaint.setColor(mLeftColor);
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
@@ -157,7 +179,7 @@
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(MIDDLE_COLOR);
+            mPaint.setColor(mMiddleColor);
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
@@ -168,7 +190,7 @@
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(RIGHT_COLOR);
+            mPaint.setColor(mRightColor);
             canvas.drawRect(mRect, mPaint);
         }
     }
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
new file mode 100644
index 0000000..6d9a399
--- /dev/null
+++ b/src/com/android/settings/applications/LinearColorPreference.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.view.View;
+import com.android.settings.R;
+
+public class LinearColorPreference extends Preference {
+    float mRedRatio;
+    float mYellowRatio;
+    float mGreenRatio;
+
+    public LinearColorPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_linearcolor);
+    }
+
+    public void setRatios(float red, float yellow, float green) {
+        mRedRatio = red;
+        mYellowRatio = yellow;
+        mGreenRatio = green;
+        notifyChanged();
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        LinearColorBar colors = (LinearColorBar)view.findViewById(
+                R.id.linear_color_bar);
+        colors.setShowIndicator(false);
+        colors.setColors(0xffcc3000, 0xffcccc00, 0xff00cc30);
+        colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
+    }
+}
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
index dec283f..e180205 100644
--- a/src/com/android/settings/applications/ProcStatsEntry.java
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -18,7 +18,9 @@
 
 import com.android.internal.app.ProcessStats;
 
-public class ProcStatsEntry {
+import java.util.ArrayList;
+
+public final class ProcStatsEntry {
     final String mPackage;
     final int mUid;
     final String mName;
@@ -27,7 +29,10 @@
     final long mAvgPss;
     final long mWeight;
 
-    ProcStatsEntry(ProcessStats.ProcessState proc, ProcessStats.ProcessDataCollection tmpTotals) {
+    ArrayList<Service> mServices;
+
+    public ProcStatsEntry(ProcessStats.ProcessState proc,
+            ProcessStats.ProcessDataCollection tmpTotals) {
         ProcessStats.computeProcessData(proc, tmpTotals, 0);
         mPackage = proc.mPackage;
         mUid = proc.mUid;
@@ -37,4 +42,35 @@
         mAvgPss = tmpTotals.avgPss;
         mWeight = mDuration * mAvgPss;
     }
+
+    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!
+            if (mServices == null) {
+                mServices = new ArrayList<Service>();
+            }
+            mServices.add(new Service(svc));
+        }
+    }
+
+    public static final class Service {
+        final String mPackage;
+        final String mName;
+        final long mDuration;
+
+        public Service(ProcessStats.ServiceState service) {
+            mPackage = service.mPackage;
+            mName = service.mName;
+            mDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_STARTED,
+                    ProcessStats.STATE_NOTHING, 0, 0)
+                + ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_BOUND,
+                    ProcessStats.STATE_NOTHING, 0, 0)
+                + ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_EXEC,
+                    ProcessStats.STATE_NOTHING, 0, 0);
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 3632288..ec49e0d 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -33,6 +33,7 @@
 import android.preference.PreferenceScreen;
 import android.text.format.DateFormat;
 import android.util.Log;
+import android.util.SparseArray;
 import android.util.TimeUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -60,11 +61,24 @@
 
     static final int MAX_ITEMS_TO_LIST = 20;
 
+    final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
+        @Override
+        public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
+            if (lhs.mWeight < rhs.mWeight) {
+                return 1;
+            } else if (lhs.mWeight > rhs.mWeight) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
     private static ProcessStats sStatsXfer;
 
     IProcessStats mProcessStats;
     UserManager mUm;
     ProcessStats mStats;
+    int mMemState;
 
     private PreferenceGroup mAppListGroup;
     private Preference mMemStatusPref;
@@ -169,8 +183,17 @@
         mAppListGroup.addPreference(mMemStatusPref);
         String durationString = Utils.formatElapsedTime(getActivity(),
                 mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime);
+        CharSequence memString;
+        CharSequence[] memStates = getResources().getTextArray(R.array.ram_states);
+        if (mMemState >= 0 && mMemState < memStates.length) {
+            memString = memStates[mMemState];
+        } else {
+            memString = "?";
+        }
         mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
                 durationString));
+        mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
+                        memString));
         /*
         mMemStatusPref.setTitle(DateFormat.format(DateFormat.getBestDateTimePattern(
                 getActivity().getResources().getConfiguration().locale,
@@ -188,30 +211,47 @@
 
         long now = SystemClock.uptimeMillis();
 
+        final PackageManager pm = getActivity().getPackageManager();
+
         mTotalTime = ProcessStats.dumpSingleTime(null, null, mStats.mMemFactorDurations,
                 mStats.mMemFactor, mStats.mStartTime, now);
 
+        LinearColorPreference colors = new LinearColorPreference(getActivity());
+        colors.setOrder(-1);
+        mAppListGroup.addPreference(colors);
+
+        long[] memTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
+        for (int iscreen=0; iscreen<ProcessStats.ADJ_COUNT; iscreen+=ProcessStats.ADJ_SCREEN_MOD) {
+            for (int imem=0; imem<ProcessStats.ADJ_MEM_FACTOR_COUNT; imem++) {
+                int state = imem+iscreen;
+                memTimes[imem] += mStats.mMemFactorDurations[state];
+            }
+        }
+
+        colors.setRatios(memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL] / (float)mTotalTime,
+                (memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]) / (float)mTotalTime,
+                memTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL] / (float)mTotalTime);
+
+        ArrayList<ProcStatsEntry> procs = new ArrayList<ProcStatsEntry>();
+
+        /*
         ArrayList<ProcessStats.ProcessState> rawProcs = mStats.collectProcessesLocked(
                 ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ,
                 ProcessStats.BACKGROUND_PROC_STATES, now, null);
-
-        final PackageManager pm = getActivity().getPackageManager();
-
-        ArrayList<ProcStatsEntry> procs = new ArrayList<ProcStatsEntry>();
         for (int i=0, N=(rawProcs != null ? rawProcs.size() : 0); i<N; i++) {
             procs.add(new ProcStatsEntry(rawProcs.get(i), totals));
         }
-        Collections.sort(procs, new Comparator<ProcStatsEntry>() {
-            @Override
-            public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
-                if (lhs.mWeight < rhs.mWeight) {
-                    return 1;
-                } else if (lhs.mWeight > rhs.mWeight) {
-                    return -1;
-                }
-                return 0;
+        */
+
+        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));
             }
-        });
+        }
+
+        Collections.sort(procs, sEntryCompare);
         while (procs.size() > MAX_ITEMS_TO_LIST) {
             procs.remove(procs.size()-1);
         }
@@ -232,19 +272,56 @@
             ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null);
             ApplicationInfo targetApp = null;
             String label = proc.mName;
+            String pkgName = null;
             if (proc.mUnique) {
+                pkgName = proc.mPackage;
+                proc.addServices(mStats.getPackageStateLocked(proc.mPackage, proc.mUid));
+            } else {
+                // See if there is one significant package that was running here.
+                ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>();
+                for (int ipkg=0, NPKG=mStats.mPackages.getMap().size(); ipkg<NPKG; ipkg++) {
+                    SparseArray<ProcessStats.PackageState> uids
+                            = mStats.mPackages.getMap().valueAt(ipkg);
+                    for (int iu=0, NU=uids.size(); iu<NU; iu++) {
+                        if (uids.keyAt(iu) != proc.mUid) {
+                            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(proc.mName)) {
+                                match = true;
+                                subProcs.add(new ProcStatsEntry(subProc, totals));
+                            }
+                        }
+                        if (match) {
+                            proc.addServices(mStats.getPackageStateLocked(proc.mPackage,
+                                    proc.mUid));
+                        }
+                    }
+                }
+                if ( subProcs.size() > 1) {
+                    Collections.sort(subProcs, sEntryCompare);
+                    if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) {
+                        pkgName = subProcs.get(0).mPackage;
+                    }
+                }
+            }
+            if (pkgName != null) {
                 // Only one app associated with this process.
                 try {
-                    targetApp = pm.getApplicationInfo(proc.mPackage,
+                    targetApp = pm.getApplicationInfo(pkgName,
                             PackageManager.GET_DISABLED_COMPONENTS |
                             PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
                             PackageManager.GET_UNINSTALLED_PACKAGES);
                     String name = targetApp.loadLabel(pm).toString();
-                    if (proc.mName.equals(proc.mPackage)) {
+                    if (proc.mName.equals(pkgName)) {
                         label = name;
                     } else {
-                        if (proc.mName.startsWith(proc.mPackage)) {
-                            int off = proc.mPackage.length();
+                        if (proc.mName.startsWith(pkgName)) {
+                            int off = pkgName.length();
                             if (proc.mName.length() > off) {
                                 off++;
                             }
@@ -258,15 +335,15 @@
             }
             if (targetApp == null) {
                 String[] packages = pm.getPackagesForUid(proc.mUid);
-                for (String pkgName : packages) {
+                for (String curPkg : packages) {
                     try {
-                        final PackageInfo pi = pm.getPackageInfo(pkgName,
+                        final PackageInfo pi = pm.getPackageInfo(curPkg,
                                 PackageManager.GET_DISABLED_COMPONENTS |
                                 PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
                                 PackageManager.GET_UNINSTALLED_PACKAGES);
                         if (pi.sharedUserLabel != 0) {
                             targetApp = pi.applicationInfo;
-                            final CharSequence nm = pm.getText(pkgName,
+                            final CharSequence nm = pm.getText(curPkg,
                                     pi.sharedUserLabel, pi.applicationInfo);
                             if (nm != null) {
                                 label = nm.toString() + " (" + proc.mName + ")";
@@ -293,6 +370,7 @@
 
     private void load() {
         try {
+            mMemState = mProcessStats.getCurrentMemoryState();
             ArrayList<ParcelFileDescriptor> fds = new ArrayList<ParcelFileDescriptor>();
             byte[] data = mProcessStats.getCurrentStats(fds);
             Parcel parcel = Parcel.obtain();
@@ -300,7 +378,7 @@
             parcel.setDataPosition(0);
             mStats = ProcessStats.CREATOR.createFromParcel(parcel);
             int i = fds.size()-1;
-            while (i > 0 && (mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime)
+            while (i >= 0 && (mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime)
                     < (24*60*60*1000)) {
                 Log.i(TAG, "Not enough data, loading next file @ " + i);
                 ProcessStats stats = new ProcessStats(false);
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 16476fa..aac1d4e 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -58,7 +58,7 @@
 
     private CheckBox mRememberChoice;
     private boolean mRememberChoiceValue = false;
-
+    private int mRequestType = 0;
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -91,15 +91,18 @@
         mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         mReturnPackage = i.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
         mReturnClass = i.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
-        int requestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+        mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
 
-        if (requestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
-            showConnectionDialog();
-        } else if (requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
-            showPhonebookDialog();
-        } else {
-            Log.e(TAG, "Error: bad request type: " + requestType);
+        if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
+            showDialog(getString(R.string.bluetooth_connection_permission_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            showDialog(getString(R.string.bluetooth_map_request), mRequestType);
+        }
+        else {
+            Log.e(TAG, "Error: bad request type: " + mRequestType);
             finish();
             return;
         }
@@ -108,62 +111,57 @@
         mReceiverRegistered = true;
     }
 
-    private void showConnectionDialog() {
+
+    private void showDialog(String title, int requestType)
+    {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_connection_permission_request);
-        p.mView = createConnectionDialogView();
+        p.mTitle = title;
+        switch(requestType)
+        {
+        case BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION:
+            p.mView = createConnectionDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+            p.mView = createPhonebookDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+            p.mView = createMapDialogView();
+            break;
+        }
         p.mPositiveButtonText = getString(R.string.yes);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.no);
         p.mNegativeButtonListener = this;
         mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
         setupAlert();
+
     }
 
-    private void showPhonebookDialog() {
-        final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_phonebook_request);
-        p.mView = createPhonebookDialogView();
-        p.mPositiveButtonText = getString(android.R.string.yes);
-        p.mPositiveButtonListener = this;
-        p.mNegativeButtonText = getString(android.R.string.no);
-        p.mNegativeButtonListener = this;
-        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
-        setupAlert();
-    }
-
-    private String createConnectionDisplayText() {
-        String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
-
-        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
-                mRemoteName);
+    private String createDisplayText(String message) {
+        String mMessage1 = message;
         return mMessage1;
     }
 
-    private String createPhonebookDisplayText() {
+    private String createRemoteName()
+    {
         String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
-
         if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text,
-                                     mRemoteName, mRemoteName);
-        return mMessage1;
+        return mRemoteName;
     }
 
     private View createConnectionDialogView() {
+        String mRemoteName = createRemoteName();
         mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createConnectionDisplayText());
+        messageView.setText(createDisplayText(getString(R.string.bluetooth_connection_dialog_text,
+                mRemoteName)));
         return mView;
     }
 
-    private View createPhonebookDialogView() {
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_pb_access, null);
-        messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createPhonebookDisplayText());
-        mRememberChoice = (CheckBox)mView.findViewById(R.id.bluetooth_pb_remember_choice);
+    private void createCheckbox(int viewId)
+    {
+        mRememberChoice = (CheckBox)mView.findViewById(viewId);
         mRememberChoice.setChecked(false);
         mRememberChoice.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -174,26 +172,42 @@
                 }
             }
             });
+    }
+    private View createPhonebookDialogView() {
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(createDisplayText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
+                mRemoteName, mRemoteName)));
+        createCheckbox(R.id.bluetooth_remember_choice);
+        return mView;
+    }
+    private View createMapDialogView() {
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(createDisplayText(getString(R.string.bluetooth_map_acceptance_dialog_text,
+                mRemoteName, mRemoteName)));
+        createCheckbox(R.id.bluetooth_remember_choice);
         return mView;
     }
 
     private void onPositive() {
         if (DEBUG) Log.d(TAG, "onPositive mRememberChoiceValue: " + mRememberChoiceValue);
+        if (mRememberChoiceValue)
+            savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_ALLOWED);
 
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED);
-        }
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
-                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
+                            BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
         finish();
     }
 
     private void onNegative() {
         if (DEBUG) Log.d(TAG, "onNegative mRememberChoiceValue: " + mRememberChoiceValue);
 
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED);
-        }
+        if (mRememberChoiceValue)
+            savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_REJECTED);
+
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, false,
                              null, false // dummy value, no effect since last param is null
                              );
@@ -246,18 +260,23 @@
         return true;
     }
 
-    private void savePhonebookPermissionChoice(int permissionChoice) {
+    private void savePermissionChoice(int permissionType, int permissionChoice) {
         LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(this);
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        if (cachedDevice != null ) {
-            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
-        } else {
+        if (DEBUG) Log.d(TAG, "savePermissionChoice permissionType: " + permissionType);
+        if (cachedDevice == null ) {
             cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
                                                          bluetoothManager.getProfileManager(),
                                                          mDevice);
-            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
         }
+        if (permissionType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS){
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        }else if (permissionType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS){
+            cachedDevice.setMessagePermissionChoice(permissionChoice);
+        }
+
     }
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index e2231bb..343018e 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -128,8 +128,10 @@
     private boolean checkUserChoice() {
         boolean processed = false;
 
-        // we only remember PHONEBOOK permission
-        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+        // ignore if it is something else than phonebook/message settings it wants us to remember
+        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            if (DEBUG) Log.d(TAG, "Unknown RequestType: " + mRequestType);
             return processed;
         }
 
@@ -143,23 +145,45 @@
                 bluetoothManager.getProfileManager(), mDevice);
         }
 
-        int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
+        if(mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
 
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_UNKNOWN) {
-            return processed;
-        }
+            int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
 
-        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED) {
-            sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
-            processed = true;
-        } else if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED) {
-            sendIntentToReceiver(intentName, false,
-                                 null, false // dummy value, no effect since previous param is null
-                                 );
-            processed = true;
-        } else {
-            Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (phonebookPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false ); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            }
+
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+
+            int messagePermission = cachedDevice.getMessagePermissionChoice();
+
+            if (messagePermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (messagePermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (messagePermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad messagePermission: " + messagePermission);
+            }
         }
         return processed;
     }
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 4b19b9c..9742027 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -66,17 +66,22 @@
 
     private int mPhonebookPermissionChoice;
 
+    private int mMessagePermissionChoice;
+
+
     private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
 
-    // Following constants indicate the user's choices of Phone book access settings
+    // Following constants indicate the user's choices of Phone book/message access settings
     // User hasn't made any choice or settings app has wiped out the memory
-    final static int PHONEBOOK_ACCESS_UNKNOWN = 0;
+    final static int ACCESS_UNKNOWN = 0;
     // User has accepted the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_ALLOWED = 1;
+    final static int ACCESS_ALLOWED = 1;
     // User has rejected the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_REJECTED = 2;
+    final static int ACCESS_REJECTED = 2;
+
 
     private final static String PHONEBOOK_PREFS_NAME = "bluetooth_phonebook_permission";
+    private final static String MESSAGE_PREFS_NAME = "bluetooth_message_permission";
 
     /**
      * When we connect to multiple profiles, we only want to display a single
@@ -349,6 +354,7 @@
         fetchBtClass();
         updateProfiles();
         fetchPhonebookPermissionChoice();
+        fetchMessagePermissionChoice();
 
         mVisible = false;
         dispatchAttributesChanged();
@@ -513,7 +519,8 @@
         if (bondState == BluetoothDevice.BOND_NONE) {
             mProfiles.clear();
             mConnectAfterPairing = false;  // cancel auto-connect
-            setPhonebookPermissionChoice(PHONEBOOK_ACCESS_UNKNOWN);
+            setPhonebookPermissionChoice(ACCESS_UNKNOWN);
+            setMessagePermissionChoice(ACCESS_UNKNOWN);
         }
 
         refresh();
@@ -632,7 +639,7 @@
     void setPhonebookPermissionChoice(int permissionChoice) {
         SharedPreferences.Editor editor =
             mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME, Context.MODE_PRIVATE).edit();
-        if (permissionChoice == PHONEBOOK_ACCESS_UNKNOWN) {
+        if (permissionChoice == ACCESS_UNKNOWN) {
             editor.remove(mDevice.getAddress());
         } else {
             editor.putInt(mDevice.getAddress(), permissionChoice);
@@ -645,7 +652,31 @@
         SharedPreferences preference = mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME,
                                                                      Context.MODE_PRIVATE);
         mPhonebookPermissionChoice = preference.getInt(mDevice.getAddress(),
-                                                       PHONEBOOK_ACCESS_UNKNOWN);
+                                                       ACCESS_UNKNOWN);
+    }
+
+
+    int getMessagePermissionChoice() {
+        return mMessagePermissionChoice;
+    }
+
+    void setMessagePermissionChoice(int permissionChoice) {
+        SharedPreferences.Editor editor =
+            mContext.getSharedPreferences(MESSAGE_PREFS_NAME, Context.MODE_PRIVATE).edit();
+        if (permissionChoice == ACCESS_UNKNOWN) {
+            editor.remove(mDevice.getAddress());
+        } else {
+            editor.putInt(mDevice.getAddress(), permissionChoice);
+        }
+        editor.commit();
+        mMessagePermissionChoice = permissionChoice;
+    }
+
+    private void fetchMessagePermissionChoice() {
+        SharedPreferences preference = mContext.getSharedPreferences(MESSAGE_PREFS_NAME,
+                                                                     Context.MODE_PRIVATE);
+        mMessagePermissionChoice = preference.getInt(mDevice.getAddress(),
+                                                       ACCESS_UNKNOWN);
     }
 
 }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index de8202b..4b6a6b0 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -34,7 +34,7 @@
  */
 public final class DevicePickerFragment extends DeviceListPreferenceFragment {
 
-    DevicePickerFragment() {
+    public DevicePickerFragment() {
         super(null /* Not tied to any user restrictions. */);
     }
 
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
old mode 100755
new mode 100644
index 5d254ae..59a6944
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -346,7 +346,8 @@
             removedProfiles.remove(mOppProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) &&
+        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) ||
+             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) &&
             mHidProfile != null) {
             profiles.add(mHidProfile);
             removedProfiles.remove(mHidProfile);
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index d581fb4..5245434 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -30,7 +30,11 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-class BatterySipper implements Comparable<BatterySipper> {
+/**
+ * Contains information about package name, icon image, power usage about an
+ * application or a system service.
+ */
+public class BatterySipper implements Comparable<BatterySipper> {
     final Context mContext;
     /* Cache cleared when PowerUsageSummary is destroyed */
     static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
@@ -56,6 +60,7 @@
     double percent;
     double noCoveragePercent;
     String defaultPackageName;
+    String[] mPackages;
 
     static class UidToDetail {
         String name;
@@ -90,15 +95,30 @@
         return values;
     }
 
-    Drawable getIcon() {
+    public Drawable getIcon() {
         return icon;
     }
 
+    /**
+     * Gets the application name
+     */
+    public String getLabel() {
+        return name;
+    }
+
+    @Override
     public int compareTo(BatterySipper other) {
         // Return the flipped value because we want the items in descending order
         return Double.compare(other.getSortValue(), getSortValue());
     }
 
+    /**
+     * Gets a list of packages associated with the current user
+     */
+    public String[] getPackages() {
+        return mPackages;
+    }
+
     void getQuickNameIconForUid(Uid uidObj) {
         final int uid = uidObj.getUid();
         final String uidString = Integer.toString(uid);
@@ -125,27 +145,36 @@
         } else {
             //name = packages[0];
         }
-        synchronized (mRequestQueue) {
-            mRequestQueue.add(this);
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                mRequestQueue.add(this);
+            }
         }
     }
 
+    public static void clearUidCache() {
+        sUidCache.clear();
+    }
+
     /**
-     * Sets name and icon
-     * @param uid Uid of the application
+     * Loads the app label and icon image and stores into the cache.
      */
-    void getNameIcon() {
+    public void loadNameAndIcon() {
+        // Bail out if the current sipper is not an App sipper.
+        if (uidObj == null) {
+            return;
+        }
         PackageManager pm = mContext.getPackageManager();
         final int uid = uidObj.getUid();
         final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
-        String[] packages = pm.getPackagesForUid(uid);
-        if (packages == null) {
+        mPackages = pm.getPackagesForUid(uid);
+        if (mPackages == null) {
             name = Integer.toString(uid);
             return;
         }
 
-        String[] packageLabels = new String[packages.length];
-        System.arraycopy(packages, 0, packageLabels, 0, packages.length);
+        String[] packageLabels = new String[mPackages.length];
+        System.arraycopy(mPackages, 0, packageLabels, 0, mPackages.length);
 
         int preferredIndex = -1;
         // Convert package names to user-facing labels where possible
@@ -159,7 +188,7 @@
                     packageLabels[i] = label.toString();
                 }
                 if (ai.icon != 0) {
-                    defaultPackageName = packages[i];
+                    defaultPackageName = mPackages[i];
                     icon = ai.loadIcon(pm);
                     break;
                 }
@@ -172,7 +201,7 @@
             name = packageLabels[0];
         } else {
             // Look for an official name for this UID.
-            for (String pkgName : packages) {
+            for (String pkgName : mPackages) {
                 try {
                     final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
                     if (pi.sharedUserLabel != 0) {
@@ -197,6 +226,9 @@
         utd.icon = icon;
         utd.packageName = defaultPackageName;
         sUidCache.put(uidString, utd);
-        mHandler.sendMessage(mHandler.obtainMessage(PowerUsageSummary.MSG_UPDATE_NAME_ICON, this));
+        if (mHandler != null) {
+            mHandler.sendMessage(
+                    mHandler.obtainMessage(BatteryStatsHelper.MSG_UPDATE_NAME_ICON, this));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
new file mode 100644
index 0000000..2a3e6e8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
@@ -0,0 +1,819 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import static android.os.BatteryStats.NETWORK_MOBILE_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_MOBILE_TX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_TX_BYTES;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.BatteryStats;
+import android.os.BatteryStats.Uid;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcel;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.PreferenceActivity;
+import android.telephony.SignalStrength;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.internal.app.IBatteryStats;
+import com.android.internal.os.BatteryStatsImpl;
+import com.android.internal.os.PowerProfile;
+import com.android.internal.util.FastPrintWriter;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
+import com.android.settings.users.UserUtils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A helper class for retrieving the power usage information for all applications and services.
+ *
+ * The caller must initialize this class as soon as activity object is ready to use (for example, in
+ * onAttach() for Fragment), call create() in onCreate() and call destroy() in onDestroy().
+ */
+public class BatteryStatsHelper {
+
+    private static final boolean DEBUG = false;
+
+    private static final String TAG = BatteryStatsHelper.class.getSimpleName();
+
+    private static BatteryStatsImpl sStatsXfer;
+    private IBatteryStats mBatteryInfo;
+    private UserManager mUm;
+    private BatteryStatsImpl mStats;
+    private PowerProfile mPowerProfile;
+
+    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
+    private final SparseArray<List<BatterySipper>> mUserSippers
+            = new SparseArray<List<BatterySipper>>();
+    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
+
+    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
+
+    private long mStatsPeriod = 0;
+    private double mMaxPower = 1;
+    private double mTotalPower;
+    private double mWifiPower;
+    private double mBluetoothPower;
+
+    // How much the apps together have left WIFI running.
+    private long mAppWifiRunning;
+
+    /** Queue for fetching name and icon for an application */
+    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
+
+    private Activity mActivity;
+    private Handler mHandler;
+
+    private class NameAndIconLoader extends Thread {
+        private boolean mAbort = false;
+
+        public NameAndIconLoader() {
+            super("BatteryUsage Icon Loader");
+        }
+
+        public void abort() {
+            mAbort = true;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                BatterySipper bs;
+                synchronized (mRequestQueue) {
+                    if (mRequestQueue.isEmpty() || mAbort) {
+                        mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
+                        return;
+                    }
+                    bs = mRequestQueue.remove(0);
+                }
+                bs.loadNameAndIcon();
+            }
+        }
+    }
+
+    private NameAndIconLoader mRequestThread;
+
+    public BatteryStatsHelper(Activity activity, Handler handler) {
+        mActivity = activity;
+        mHandler = handler;
+    }
+
+    /** Clears the current stats and forces recreating for future use. */
+    public void clearStats() {
+        mStats = null;
+    }
+
+    public BatteryStatsImpl getStats() {
+        if (mStats == null) {
+            load();
+        }
+        return mStats;
+    }
+
+    public PowerProfile getPowerProfile() {
+        return mPowerProfile;
+    }
+
+    public void create(Bundle icicle) {
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
+        mBatteryInfo = IBatteryStats.Stub.asInterface(
+                ServiceManager.getService(BatteryStats.SERVICE_NAME));
+        mUm = (UserManager) mActivity.getSystemService(Context.USER_SERVICE);
+        mPowerProfile = new PowerProfile(mActivity);
+    }
+
+    public void pause() {
+        if (mRequestThread != null) {
+            mRequestThread.abort();
+        }
+    }
+
+    public void destroy() {
+        if (mActivity.isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        } else {
+            BatterySipper.sUidCache.clear();
+        }
+    }
+
+    public void startBatteryDetailPage(PreferenceActivity caller, BatterySipper sipper) {
+        // Initialize mStats if necessary.
+        getStats();
+
+        Bundle args = new Bundle();
+        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
+        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
+        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
+        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
+        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
+        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
+        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
+        if (sipper.uidObj != null) {
+            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
+        }
+        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
+
+        int[] types;
+        double[] values;
+        switch (sipper.drainType) {
+            case APP:
+            case USER:
+            {
+                Uid uid = sipper.uidObj;
+                types = new int[] {
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_gps,
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                    R.string.usage_type_audio,
+                    R.string.usage_type_video,
+                };
+                values = new double[] {
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.gpsTime,
+                    sipper.wifiRunningTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                    0,
+                    0
+                };
+
+                if (sipper.drainType == DrainType.APP) {
+                    Writer result = new StringWriter();
+                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
+
+                    result = new StringWriter();
+                    printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
+                            result.toString());
+                }
+            }
+            break;
+            case CELL:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_no_coverage
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.noCoveragePercent
+                };
+            }
+            break;
+            case WIFI:
+            {
+                types = new int[] {
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            case BLUETOOTH:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            default:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time
+                };
+                values = new double[] {
+                    sipper.usageTime
+                };
+            }
+        }
+        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
+        caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, null, 0);
+    }
+
+    public void refreshStats() {
+        // Initialize mStats if necessary.
+        getStats();
+
+        mMaxPower = 0;
+        mTotalPower = 0;
+        mWifiPower = 0;
+        mBluetoothPower = 0;
+        mAppWifiRunning = 0;
+
+        mUsageList.clear();
+        mWifiSippers.clear();
+        mBluetoothSippers.clear();
+        mUserSippers.clear();
+        mUserPower.clear();
+
+        processAppUsage();
+        processMiscUsage();
+
+        Collections.sort(mUsageList);
+
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                if (!mRequestQueue.isEmpty()) {
+                    if (mRequestThread != null) {
+                        mRequestThread.abort();
+                    }
+                    mRequestThread = new NameAndIconLoader();
+                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
+                    mRequestThread.start();
+                    mRequestQueue.notify();
+                }
+            }
+        }
+    }
+
+    private void processAppUsage() {
+        SensorManager sensorManager = (SensorManager) mActivity.getSystemService(
+                Context.SENSOR_SERVICE);
+        final int which = mStatsType;
+        final int speedSteps = mPowerProfile.getNumSpeedSteps();
+        final double[] powerCpuNormal = new double[speedSteps];
+        final long[] cpuSpeedStepTimes = new long[speedSteps];
+        for (int p = 0; p < speedSteps; p++) {
+            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
+        }
+        final double mobilePowerPerByte = getMobilePowerPerByte();
+        final double wifiPowerPerByte = getWifiPowerPerByte();
+        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
+        long appWakelockTime = 0;
+        BatterySipper osApp = null;
+        mStatsPeriod = uSecTime;
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+            double p; // in mAs
+            double power = 0; // in mAs
+            double highestDrain = 0;
+            String packageWithHighestDrain = null;
+            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
+            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
+            long cpuTime = 0;
+            long cpuFgTime = 0;
+            long wakelockTime = 0;
+            long gpsTime = 0;
+            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
+            if (processStats.size() > 0) {
+                // Process CPU time
+                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
+                        : processStats.entrySet()) {
+                    Uid.Proc ps = ent.getValue();
+                    final long userTime = ps.getUserTime(which);
+                    final long systemTime = ps.getSystemTime(which);
+                    final long foregroundTime = ps.getForegroundTime(which);
+                    cpuFgTime += foregroundTime * 10; // convert to millis
+                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
+                    int totalTimeAtSpeeds = 0;
+                    // Get the total first
+                    for (int step = 0; step < speedSteps; step++) {
+                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
+                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
+                    }
+                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
+                    // Then compute the ratio of time spent at each speed
+                    double processPower = 0;
+                    for (int step = 0; step < speedSteps; step++) {
+                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
+                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
+                    }
+                    cpuTime += tmpCpuTime;
+                    if (DEBUG && processPower != 0) {
+                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
+                                ent.getKey(), processPower / 1000));
+                    }
+                    power += processPower;
+                    if (packageWithHighestDrain == null
+                            || packageWithHighestDrain.startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    } else if (highestDrain < processPower
+                            && !ent.getKey().startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    }
+                }
+            }
+            if (cpuFgTime > cpuTime) {
+                if (DEBUG && cpuFgTime > cpuTime + 10000) {
+                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
+                }
+                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
+            }
+            power /= 1000;
+            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
+
+            // Process wake lock usage
+            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
+            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
+                    : wakelockStats.entrySet()) {
+                Uid.Wakelock wakelock = wakelockEntry.getValue();
+                // Only care about partial wake locks since full wake locks
+                // are canceled when the user turns the screen off.
+                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+                if (timer != null) {
+                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
+                }
+            }
+            wakelockTime /= 1000; // convert to millis
+            appWakelockTime += wakelockTime;
+
+            // Add cost of holding a wake lock
+            p = (wakelockTime
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
+
+            // Add cost of mobile traffic
+            final long mobileRx = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+            final long mobileTx = u.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+            p = (mobileRx + mobileTx) * mobilePowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
+
+            // Add cost of wifi traffic
+            final long wifiRx = u.getNetworkActivityCount(NETWORK_WIFI_RX_BYTES, mStatsType);
+            final long wifiTx = u.getNetworkActivityCount(NETWORK_WIFI_TX_BYTES, mStatsType);
+            p = (wifiRx + wifiTx) * wifiPowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
+
+            // Add cost of keeping WIFI running.
+            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
+            mAppWifiRunning += wifiRunningTimeMs;
+            p = (wifiRunningTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
+
+            // Add cost of WIFI scans
+            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
+            p = (wifiScanTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
+
+            // Process Sensor usage
+            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
+            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
+                    : sensorStats.entrySet()) {
+                Uid.Sensor sensor = sensorEntry.getValue();
+                int sensorHandle = sensor.getHandle();
+                BatteryStats.Timer timer = sensor.getSensorTime();
+                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
+                double multiplier = 0;
+                switch (sensorHandle) {
+                    case Uid.Sensor.GPS:
+                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
+                        gpsTime = sensorTime;
+                        break;
+                    default:
+                        List<Sensor> sensorList = sensorManager.getSensorList(
+                                android.hardware.Sensor.TYPE_ALL);
+                        for (android.hardware.Sensor s : sensorList) {
+                            if (s.getHandle() == sensorHandle) {
+                                multiplier = s.getPower();
+                                break;
+                            }
+                        }
+                }
+                p = (multiplier * sensorTime) / 1000;
+                power += p;
+                if (DEBUG && p != 0) {
+                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
+                }
+            }
+
+            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
+
+            // Add the app to the list if it is consuming power
+            boolean isOtherUser = false;
+            final int userId = UserHandle.getUserId(u.getUid());
+            if (power != 0 || u.getUid() == 0) {
+                BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                        packageWithHighestDrain, DrainType.APP, 0, u,
+                        new double[] {power});
+                app.cpuTime = cpuTime;
+                app.gpsTime = gpsTime;
+                app.wifiRunningTime = wifiRunningTimeMs;
+                app.cpuFgTime = cpuFgTime;
+                app.wakeLockTime = wakelockTime;
+                app.mobileRxBytes = mobileRx;
+                app.mobileTxBytes = mobileTx;
+                app.wifiRxBytes = wifiRx;
+                app.wifiTxBytes = wifiTx;
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiSippers.add(app);
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothSippers.add(app);
+                } else if (userId != UserHandle.myUserId()
+                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
+                    isOtherUser = true;
+                    List<BatterySipper> list = mUserSippers.get(userId);
+                    if (list == null) {
+                        list = new ArrayList<BatterySipper>();
+                        mUserSippers.put(userId, list);
+                    }
+                    list.add(app);
+                } else {
+                    mUsageList.add(app);
+                }
+                if (u.getUid() == 0) {
+                    osApp = app;
+                }
+            }
+            if (power != 0) {
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiPower += power;
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothPower += power;
+                } else if (isOtherUser) {
+                    Double userPower = mUserPower.get(userId);
+                    if (userPower == null) {
+                        userPower = power;
+                    } else {
+                        userPower += power;
+                    }
+                    mUserPower.put(userId, userPower);
+                } else {
+                    if (power > mMaxPower) mMaxPower = power;
+                    mTotalPower += power;
+                }
+            }
+        }
+
+        // The device has probably been awake for longer than the screen on
+        // time and application wake lock time would account for.  Assign
+        // this remainder to the OS, if possible.
+        if (osApp != null) {
+            long wakeTimeMillis = mStats.computeBatteryUptime(
+                    SystemClock.uptimeMillis() * 1000, which) / 1000;
+            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
+                    SystemClock.elapsedRealtime(), which) / 1000);
+            if (wakeTimeMillis > 0) {
+                double power = (wakeTimeMillis
+                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
+                osApp.wakeLockTime += wakeTimeMillis;
+                osApp.value += power;
+                osApp.values[0] += power;
+                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
+                mTotalPower += power;
+            }
+        }
+    }
+
+    private void addPhoneUsage(long uSecNow) {
+        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
+        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                * phoneOnTimeMs / 1000;
+        addEntry(mActivity.getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
+                R.drawable.ic_settings_voice_calls, phoneOnPower);
+    }
+
+    private void addScreenUsage(long uSecNow) {
+        double power = 0;
+        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
+        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
+        final double screenFullPower =
+                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
+        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
+            double screenBinPower = screenFullPower * (i + 0.5f)
+                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
+            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
+            power += screenBinPower * brightnessTime;
+            if (DEBUG) {
+                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
+                        + brightnessTime);
+            }
+        }
+        power /= 1000; // To seconds
+        addEntry(mActivity.getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
+                R.drawable.ic_settings_display, power);
+    }
+
+    private void addRadioUsage(long uSecNow) {
+        double power = 0;
+        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        long signalTimeMs = 0;
+        for (int i = 0; i < BINS; i++) {
+            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
+            power += strengthTimeMs / 1000
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
+            signalTimeMs += strengthTimeMs;
+        }
+        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
+        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
+                PowerProfile.POWER_RADIO_SCANNING);
+        BatterySipper bs =
+                addEntry(mActivity.getString(R.string.power_cell), DrainType.CELL,
+                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
+        if (signalTimeMs != 0) {
+            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
+                    / 1000 * 100.0 / signalTimeMs;
+        }
+    }
+
+    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
+        for (int i=0; i<from.size(); i++) {
+            BatterySipper wbs = from.get(i);
+            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
+            bs.cpuTime += wbs.cpuTime;
+            bs.gpsTime += wbs.gpsTime;
+            bs.wifiRunningTime += wbs.wifiRunningTime;
+            bs.cpuFgTime += wbs.cpuFgTime;
+            bs.wakeLockTime += wbs.wakeLockTime;
+            bs.mobileRxBytes += wbs.mobileRxBytes;
+            bs.mobileTxBytes += wbs.mobileTxBytes;
+            bs.wifiRxBytes += wbs.wifiRxBytes;
+            bs.wifiTxBytes += wbs.wifiTxBytes;
+        }
+    }
+
+    private void addWiFiUsage(long uSecNow) {
+        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
+        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
+                + " app runningTime=" + mAppWifiRunning);
+        runningTimeMs -= mAppWifiRunning;
+        if (runningTimeMs < 0) runningTimeMs = 0;
+        double wifiPower = (onTimeMs * 0 /* TODO */
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
+            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_wifi), DrainType.WIFI,
+                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
+        aggregateSippers(bs, mWifiSippers, "WIFI");
+    }
+
+    private void addIdleUsage(long uSecNow) {
+        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
+        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
+                / 1000;
+        addEntry(mActivity.getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
+                R.drawable.ic_settings_phone_idle, idlePower);
+    }
+
+    private void addBluetoothUsage(long uSecNow) {
+        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
+        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
+                / 1000;
+        int btPingCount = mStats.getBluetoothPingCount();
+        btPower += (btPingCount
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_bluetooth),
+                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
+                btPower + mBluetoothPower);
+        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
+    }
+
+    private void addUserUsage() {
+        for (int i=0; i<mUserSippers.size(); i++) {
+            final int userId = mUserSippers.keyAt(i);
+            final List<BatterySipper> sippers = mUserSippers.valueAt(i);
+            UserInfo info = mUm.getUserInfo(userId);
+            Drawable icon;
+            String name;
+            if (info != null) {
+                icon = UserUtils.getUserIcon(mActivity, mUm, info, mActivity.getResources());
+                name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            } else {
+                icon = null;
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_removed_user_label);
+            }
+            double power = mUserPower.get(userId);
+            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
+            bs.icon = icon;
+            aggregateSippers(bs, sippers, "User");
+        }
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the mobile radio.
+     */
+    private double getMobilePowerPerByte() {
+        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
+        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                / 3600;
+
+        final long mobileRx = mStats.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+        final long mobileTx = mStats.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+        final long mobileData = mobileRx + mobileTx;
+
+        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
+        final long mobileBps = radioDataUptimeMs != 0
+                ? mobileData * 8 * 1000 / radioDataUptimeMs
+                : MOBILE_BPS;
+
+        return MOBILE_POWER / (mobileBps / 8);
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
+     */
+    private double getWifiPowerPerByte() {
+        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
+        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
+                / 3600;
+        return WIFI_POWER / (WIFI_BPS / 8);
+    }
+
+    private void processMiscUsage() {
+        final int which = mStatsType;
+        long uSecTime = SystemClock.elapsedRealtime() * 1000;
+        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
+        final long timeSinceUnplugged = uSecNow;
+        if (DEBUG) {
+            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
+        }
+
+        addUserUsage();
+        addPhoneUsage(uSecNow);
+        addScreenUsage(uSecNow);
+        addWiFiUsage(uSecNow);
+        addBluetoothUsage(uSecNow);
+        addIdleUsage(uSecNow); // Not including cellular idle power
+        // Don't compute radio usage if it's a wifi-only device
+        if (!com.android.settings.Utils.isWifiOnly(mActivity)) {
+            addRadioUsage(uSecNow);
+        }
+    }
+
+    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
+            double power) {
+        if (power > mMaxPower) mMaxPower = power;
+        mTotalPower += power;
+        BatterySipper bs = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                label, drainType, iconId, null, new double[] {power});
+        bs.usageTime = time;
+        bs.iconId = iconId;
+        mUsageList.add(bs);
+        return bs;
+    }
+
+    public List<BatterySipper> getUsageList() {
+        return mUsageList;
+    }
+
+    static final int MSG_UPDATE_NAME_ICON = 1;
+    static final int MSG_REPORT_FULLY_DRAWN = 2;
+
+    public double getMaxPower() {
+        return mMaxPower;
+    }
+
+    public double getTotalPower() {
+        return mTotalPower;
+    }
+
+    private void load() {
+        try {
+            byte[] data = mBatteryInfo.getStatistics();
+            Parcel parcel = Parcel.obtain();
+            parcel.unmarshall(data, 0, data.length);
+            parcel.setDataPosition(0);
+            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
+                    .createFromParcel(parcel);
+            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 52d8780..7eba792 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -350,13 +350,12 @@
             pi = packages != null ? pm.getPackageInfo(packages[0], 0) : null;
         } catch (NameNotFoundException nnfe) { /* Nothing */ }
         ApplicationInfo ai = pi != null? pi.applicationInfo : null;
-        boolean isSystem = ai != null? (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0 : false;
 
         boolean removeHeader = true;
         switch (mDrainType) {
             case APP:
-                // If it is a Java application and it's not a system application
-                if (packages != null && !isSystem) {
+                // If it is a Java application and only one package is associated with the Uid
+                if (packages != null && packages.length == 1) {
                     addControl(R.string.battery_action_app_details,
                             R.string.battery_sugg_apps_info, ACTION_APP_DETAILS);
                     removeHeader = false;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 5dfbcda..1747e3f 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,66 +16,37 @@
 
 package com.android.settings.fuelgauge;
 
-import static android.os.BatteryStats.NETWORK_MOBILE_RX_BYTES;
-import static android.os.BatteryStats.NETWORK_MOBILE_TX_BYTES;
-import static android.os.BatteryStats.NETWORK_WIFI_RX_BYTES;
-import static android.os.BatteryStats.NETWORK_WIFI_TX_BYTES;
-
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
 import android.os.BatteryStats;
-import android.os.BatteryStats.Uid;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.telephony.SignalStrength;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.android.internal.app.IBatteryStats;
-import com.android.internal.os.BatteryStatsImpl;
 import com.android.internal.os.PowerProfile;
-import com.android.internal.util.FastPrintWriter;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
-import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
-import com.android.settings.users.UserUtils;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PreferenceFragment implements Runnable {
+public class PowerUsageSummary extends PreferenceFragment {
 
     private static final boolean DEBUG = false;
 
@@ -88,18 +59,6 @@
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final int MENU_HELP = Menu.FIRST + 2;
 
-    private static BatteryStatsImpl sStatsXfer;
-
-    IBatteryStats mBatteryInfo;
-    UserManager mUm;
-    BatteryStatsImpl mStats;
-    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
-    private final SparseArray<List<BatterySipper>> mUserSippers
-            = new SparseArray<List<BatterySipper>>();
-    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
-
     private PreferenceGroup mAppListGroup;
     private Preference mBatteryStatusPref;
 
@@ -108,20 +67,7 @@
     private static final int MIN_POWER_THRESHOLD = 5;
     private static final int MAX_ITEMS_TO_LIST = 10;
 
-    private long mStatsPeriod = 0;
-    private double mMaxPower = 1;
-    private double mTotalPower;
-    private double mWifiPower;
-    private double mBluetoothPower;
-    private PowerProfile mPowerProfile;
-
-    // How much the apps together have left WIFI running.
-    private long mAppWifiRunning;
-
-    /** Queue for fetching name and icon for an application */
-    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
-    private Thread mRequestThread;
-    private boolean mAbort;
+    private BatteryStatsHelper mStatsHelper;
 
     private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
 
@@ -135,34 +81,32 @@
                 String batterySummary = context.getResources().getString(
                         R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
                 mBatteryStatusPref.setTitle(batterySummary);
-                mStats = null;
+                mStatsHelper.clearStats();
                 refreshStats();
             }
         }
     };
 
     @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mStatsHelper = new BatteryStatsHelper(activity, mHandler);
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        if (icicle != null) {
-            mStats = sStatsXfer;
-        }
+        mStatsHelper.create(icicle);
 
         addPreferencesFromResource(R.xml.power_usage_summary);
-        mBatteryInfo = IBatteryStats.Stub.asInterface(
-                ServiceManager.getService(BatteryStats.SERVICE_NAME));
-        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
-        mPowerProfile = new PowerProfile(getActivity());
         setHasOptionsMenu(true);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mAbort = false;
         getActivity().registerReceiver(mBatteryInfoReceiver,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         refreshStats();
@@ -170,10 +114,8 @@
 
     @Override
     public void onPause() {
-        synchronized (mRequestQueue) {
-            mAbort = true;
-        }
-        mHandler.removeMessages(MSG_UPDATE_NAME_ICON);
+        mStatsHelper.pause();
+        mHandler.removeMessages(BatteryStatsHelper.MSG_UPDATE_NAME_ICON);
         getActivity().unregisterReceiver(mBatteryInfoReceiver);
         super.onPause();
     }
@@ -181,18 +123,14 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (getActivity().isChangingConfigurations()) {
-            sStatsXfer = mStats;
-        } else {
-            BatterySipper.sUidCache.clear();
-        }
+        mStatsHelper.destroy();
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference instanceof BatteryHistoryPreference) {
             Parcel hist = Parcel.obtain();
-            mStats.writeToParcelWithoutUids(hist, 0);
+            mStatsHelper.getStats().writeToParcelWithoutUids(hist, 0);
             byte[] histData = hist.marshall();
             Bundle args = new Bundle();
             args.putByteArray(BatteryHistoryDetail.EXTRA_STATS, histData);
@@ -206,145 +144,7 @@
         }
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
         BatterySipper sipper = pgp.getInfo();
-        Bundle args = new Bundle();
-        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
-        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
-        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
-        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
-        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
-        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
-        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
-        if (sipper.uidObj != null) {
-            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
-        }
-        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
-
-        int[] types;
-        double[] values;
-        switch (sipper.drainType) {
-            case APP:
-            case USER:
-            {
-                Uid uid = sipper.uidObj;
-                types = new int[] {
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_gps,
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                    R.string.usage_type_audio,
-                    R.string.usage_type_video,
-                };
-                values = new double[] {
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.gpsTime,
-                    sipper.wifiRunningTime,
-                    sipper.mobileRxBytes,
-                    sipper.mobileTxBytes,
-                    sipper.wifiRxBytes,
-                    sipper.wifiTxBytes,
-                    0,
-                    0
-                };
-
-                if (sipper.drainType == DrainType.APP) {
-                    Writer result = new StringWriter();
-                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
-                    mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
-                    printWriter.flush();
-                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
-
-                    result = new StringWriter();
-                    printWriter = new FastPrintWriter(result, false, 1024);
-                    mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
-                    printWriter.flush();
-                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
-                            result.toString());
-                }
-            }
-            break;
-            case CELL:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.noCoveragePercent
-                };
-            }
-            break;
-            case WIFI:
-            {
-                types = new int[] {
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.mobileRxBytes,
-                    sipper.mobileTxBytes,
-                    sipper.wifiRxBytes,
-                    sipper.wifiTxBytes,
-                };
-            } break;
-            case BLUETOOTH:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_wifi_recv,
-                    R.string.usage_type_data_wifi_send,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.mobileRxBytes,
-                    sipper.mobileTxBytes,
-                    sipper.wifiRxBytes,
-                    sipper.wifiTxBytes,
-                };
-            } break;
-            default:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time
-                };
-                values = new double[] {
-                    sipper.usageTime
-                };
-            }
-        }
-        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
-        PreferenceActivity pa = (PreferenceActivity)getActivity();
-        pa.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                R.string.details_title, null, null, 0);
-
+        mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper);
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -380,7 +180,7 @@
                 refreshStats();
                 return true;
             case MENU_STATS_REFRESH:
-                mStats = null;
+                mStatsHelper.clearStats();
                 refreshStats();
                 return true;
             default:
@@ -395,43 +195,32 @@
     }
 
     private void refreshStats() {
-        if (mStats == null) {
-            load();
-        }
-        mMaxPower = 0;
-        mTotalPower = 0;
-        mWifiPower = 0;
-        mBluetoothPower = 0;
-        mAppWifiRunning = 0;
-
         mAppListGroup.removeAll();
-        mUsageList.clear();
-        mWifiSippers.clear();
-        mBluetoothSippers.clear();
-        mUserSippers.clear();
-        mUserPower.clear();
         mAppListGroup.setOrderingAsAdded(false);
 
         mBatteryStatusPref.setOrder(-2);
         mAppListGroup.addPreference(mBatteryStatusPref);
-        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(
+                getActivity(), mStatsHelper.getStats());
         hist.setOrder(-1);
         mAppListGroup.addPreference(hist);
-        
-        if (mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL) < 10) {
+
+        if (mStatsHelper.getPowerProfile().getAveragePower(
+                PowerProfile.POWER_SCREEN_FULL) < 10) {
             addNotAvailableMessage();
             return;
         }
-        processAppUsage();
-        processMiscUsage();
-
-        Collections.sort(mUsageList);
-        for (BatterySipper sipper : mUsageList) {
+        mStatsHelper.refreshStats();
+        List<BatterySipper> usageList = mStatsHelper.getUsageList();
+        for (BatterySipper sipper : usageList) {
             if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
-            final double percentOfTotal =  ((sipper.getSortValue() / mTotalPower) * 100);
+            final double percentOfTotal =
+                    ((sipper.getSortValue() / mStatsHelper.getTotalPower()) * 100);
             if (percentOfTotal < 1) continue;
-            PowerGaugePreference pref = new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
-            final double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
+            PowerGaugePreference pref =
+                    new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
+            final double percentOfMax =
+                    (sipper.getSortValue() * 100) / mStatsHelper.getMaxPower();
             sipper.percent = percentOfTotal;
             pref.setTitle(sipper.name);
             pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
@@ -442,494 +231,16 @@
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
-        synchronized (mRequestQueue) {
-            if (!mRequestQueue.isEmpty()) {
-                if (mRequestThread == null) {
-                    mRequestThread = new Thread(this, "BatteryUsage Icon Loader");
-                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
-                    mRequestThread.start();
-                }
-                mRequestQueue.notify();
-            }
-        }
     }
 
-    private void processAppUsage() {
-        SensorManager sensorManager = (SensorManager)getActivity().getSystemService(
-                Context.SENSOR_SERVICE);
-        final int which = mStatsType;
-        final int speedSteps = mPowerProfile.getNumSpeedSteps();
-        final double[] powerCpuNormal = new double[speedSteps];
-        final long[] cpuSpeedStepTimes = new long[speedSteps];
-        for (int p = 0; p < speedSteps; p++) {
-            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
-        }
-        final double mobilePowerPerByte = getMobilePowerPerByte();
-        final double wifiPowerPerByte = getWifiPowerPerByte();
-        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
-        long appWakelockTime = 0;
-        BatterySipper osApp = null;
-        mStatsPeriod = uSecTime;
-        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
-        final int NU = uidStats.size();
-        for (int iu = 0; iu < NU; iu++) {
-            Uid u = uidStats.valueAt(iu);
-            double p; // in mAs
-            double power = 0; // in mAs
-            double highestDrain = 0;
-            String packageWithHighestDrain = null;
-            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
-            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
-            long cpuTime = 0;
-            long cpuFgTime = 0;
-            long wakelockTime = 0;
-            long gpsTime = 0;
-            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
-            if (processStats.size() > 0) {
-                // Process CPU time
-                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
-                        : processStats.entrySet()) {
-                    Uid.Proc ps = ent.getValue();
-                    final long userTime = ps.getUserTime(which);
-                    final long systemTime = ps.getSystemTime(which);
-                    final long foregroundTime = ps.getForegroundTime(which);
-                    cpuFgTime += foregroundTime * 10; // convert to millis
-                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
-                    int totalTimeAtSpeeds = 0;
-                    // Get the total first
-                    for (int step = 0; step < speedSteps; step++) {
-                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
-                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
-                    }
-                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
-                    // Then compute the ratio of time spent at each speed
-                    double processPower = 0;
-                    for (int step = 0; step < speedSteps; step++) {
-                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
-                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
-                    }
-                    cpuTime += tmpCpuTime;
-                    if (DEBUG && processPower != 0) {
-                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
-                                ent.getKey(), processPower / 1000));
-                    }
-                    power += processPower;
-                    if (packageWithHighestDrain == null
-                            || packageWithHighestDrain.startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    } else if (highestDrain < processPower
-                            && !ent.getKey().startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    }
-                }
-            }
-            if (cpuFgTime > cpuTime) {
-                if (DEBUG && cpuFgTime > cpuTime + 10000) {
-                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
-                }
-                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
-            }
-            power /= 1000;
-            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
-
-            // Process wake lock usage
-            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
-            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
-                    : wakelockStats.entrySet()) {
-                Uid.Wakelock wakelock = wakelockEntry.getValue();
-                // Only care about partial wake locks since full wake locks
-                // are canceled when the user turns the screen off.
-                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
-                if (timer != null) {
-                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
-                }
-            }
-            wakelockTime /= 1000; // convert to millis
-            appWakelockTime += wakelockTime;
-
-            // Add cost of holding a wake lock
-            p = (wakelockTime
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
-            
-            // Add cost of mobile traffic
-            final long mobileRx = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
-            final long mobileTx = u.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
-            p = (mobileRx + mobileTx) * mobilePowerPerByte;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
-
-            // Add cost of wifi traffic
-            final long wifiRx = u.getNetworkActivityCount(NETWORK_WIFI_RX_BYTES, mStatsType);
-            final long wifiTx = u.getNetworkActivityCount(NETWORK_WIFI_TX_BYTES, mStatsType);
-            p = (wifiRx + wifiTx) * wifiPowerPerByte;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
-
-            // Add cost of keeping WIFI running.
-            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
-            mAppWifiRunning += wifiRunningTimeMs;
-            p = (wifiRunningTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
-
-            // Add cost of WIFI scans
-            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
-            p = (wifiScanTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
-
-            // Process Sensor usage
-            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
-            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
-                    : sensorStats.entrySet()) {
-                Uid.Sensor sensor = sensorEntry.getValue();
-                int sensorHandle = sensor.getHandle();
-                BatteryStats.Timer timer = sensor.getSensorTime();
-                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
-                double multiplier = 0;
-                switch (sensorHandle) {
-                    case Uid.Sensor.GPS:
-                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
-                        gpsTime = sensorTime;
-                        break;
-                    default:
-                        List<Sensor> sensorList = sensorManager.getSensorList(
-                                android.hardware.Sensor.TYPE_ALL);
-                        for (android.hardware.Sensor s : sensorList) {
-                            if (s.getHandle() == sensorHandle) {
-                                multiplier = s.getPower();
-                                break;
-                            }
-                        }
-                }
-                p = (multiplier * sensorTime) / 1000;
-                power += p;
-                if (DEBUG && p != 0) {
-                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
-                }
-            }
-
-            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
-
-            // Add the app to the list if it is consuming power
-            boolean isOtherUser = false;
-            final int userId = UserHandle.getUserId(u.getUid());
-            if (power != 0 || u.getUid() == 0) {
-                BatterySipper app = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                        packageWithHighestDrain, DrainType.APP, 0, u,
-                        new double[] {power});
-                app.cpuTime = cpuTime;
-                app.gpsTime = gpsTime;
-                app.wifiRunningTime = wifiRunningTimeMs;
-                app.cpuFgTime = cpuFgTime;
-                app.wakeLockTime = wakelockTime;
-                app.mobileRxBytes = mobileRx;
-                app.mobileTxBytes = mobileTx;
-                app.wifiRxBytes = wifiRx;
-                app.wifiTxBytes = wifiTx;
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiSippers.add(app);
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothSippers.add(app);
-                } else if (userId != UserHandle.myUserId()
-                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
-                    isOtherUser = true;
-                    List<BatterySipper> list = mUserSippers.get(userId);
-                    if (list == null) {
-                        list = new ArrayList<BatterySipper>();
-                        mUserSippers.put(userId, list);
-                    }
-                    list.add(app);
-                } else {
-                    mUsageList.add(app);
-                }
-                if (u.getUid() == 0) {
-                    osApp = app;
-                }
-            }
-            if (power != 0) {
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiPower += power;
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothPower += power;
-                } else if (isOtherUser) {
-                    Double userPower = mUserPower.get(userId);
-                    if (userPower == null) {
-                        userPower = power;
-                    } else {
-                        userPower += power;
-                    }
-                    mUserPower.put(userId, userPower);
-                } else {
-                    if (power > mMaxPower) mMaxPower = power;
-                    mTotalPower += power;
-                }
-            }
-        }
-
-        // The device has probably been awake for longer than the screen on
-        // time and application wake lock time would account for.  Assign
-        // this remainder to the OS, if possible.
-        if (osApp != null) {
-            long wakeTimeMillis = mStats.computeBatteryUptime(
-                    SystemClock.uptimeMillis() * 1000, which) / 1000;
-            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
-                    SystemClock.elapsedRealtime(), which) / 1000);
-            if (wakeTimeMillis > 0) {
-                double power = (wakeTimeMillis
-                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
-                osApp.wakeLockTime += wakeTimeMillis;
-                osApp.value += power;
-                osApp.values[0] += power;
-                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
-                mTotalPower += power;
-            }
-        }
-    }
-
-    private void addPhoneUsage(long uSecNow) {
-        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
-        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                * phoneOnTimeMs / 1000;
-        addEntry(getActivity().getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
-                R.drawable.ic_settings_voice_calls, phoneOnPower);
-    }
-
-    private void addScreenUsage(long uSecNow) {
-        double power = 0;
-        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
-        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
-        final double screenFullPower =
-                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            double screenBinPower = screenFullPower * (i + 0.5f)
-                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
-            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
-            power += screenBinPower * brightnessTime;
-            if (DEBUG) {
-                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
-                        + brightnessTime);
-            }
-        }
-        power /= 1000; // To seconds
-        addEntry(getActivity().getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
-                R.drawable.ic_settings_display, power);
-    }
-
-    private void addRadioUsage(long uSecNow) {
-        double power = 0;
-        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-        long signalTimeMs = 0;
-        for (int i = 0; i < BINS; i++) {
-            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
-            power += strengthTimeMs / 1000
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
-            signalTimeMs += strengthTimeMs;
-        }
-        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
-        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
-                PowerProfile.POWER_RADIO_SCANNING);
-        BatterySipper bs =
-                addEntry(getActivity().getString(R.string.power_cell), DrainType.CELL,
-                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
-        if (signalTimeMs != 0) {
-            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
-                    / 1000 * 100.0 / signalTimeMs;
-        }
-    }
-
-    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
-        for (int i=0; i<from.size(); i++) {
-            BatterySipper wbs = from.get(i);
-            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
-            bs.cpuTime += wbs.cpuTime;
-            bs.gpsTime += wbs.gpsTime;
-            bs.wifiRunningTime += wbs.wifiRunningTime;
-            bs.cpuFgTime += wbs.cpuFgTime;
-            bs.wakeLockTime += wbs.wakeLockTime;
-            bs.mobileRxBytes += wbs.mobileRxBytes;
-            bs.mobileTxBytes += wbs.mobileTxBytes;
-            bs.wifiRxBytes += wbs.wifiRxBytes;
-            bs.wifiTxBytes += wbs.wifiTxBytes;
-        }
-    }
-
-    private void addWiFiUsage(long uSecNow) {
-        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
-        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
-                + " app runningTime=" + mAppWifiRunning);
-        runningTimeMs -= mAppWifiRunning;
-        if (runningTimeMs < 0) runningTimeMs = 0;
-        double wifiPower = (onTimeMs * 0 /* TODO */
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
-            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_wifi), DrainType.WIFI,
-                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
-        aggregateSippers(bs, mWifiSippers, "WIFI");
-    }
-
-    private void addIdleUsage(long uSecNow) {
-        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
-        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
-                / 1000;
-        addEntry(getActivity().getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
-                R.drawable.ic_settings_phone_idle, idlePower);
-    }
-
-    private void addBluetoothUsage(long uSecNow) {
-        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
-        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
-                / 1000;
-        int btPingCount = mStats.getBluetoothPingCount();
-        btPower += (btPingCount
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_bluetooth),
-                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
-                btPower + mBluetoothPower);
-        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
-    }
-
-    private void addUserUsage() {
-        final Context context = getActivity();
-        if (context == null) return;
-        for (int i=0; i<mUserSippers.size(); i++) {
-            final int userId = mUserSippers.keyAt(i);
-            final List<BatterySipper> sippers = mUserSippers.valueAt(i);
-            UserInfo info = mUm.getUserInfo(userId);
-            Drawable icon;
-            String name;
-            if (info != null) {
-                icon = UserUtils.getUserIcon(context, mUm, info, getResources());
-                name = info != null ? info.name : null;
-                if (name == null) {
-                    name = Integer.toString(info.id);
-                }
-                name = context.getResources().getString(
-                        R.string.running_process_item_user_label, name);
-            } else {
-                icon = null;
-                name = context.getResources().getString(
-                        R.string.running_process_item_removed_user_label);
-            }
-            double power = mUserPower.get(userId);
-            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
-            bs.icon = icon;
-            aggregateSippers(bs, sippers, "User");
-        }
-    }
-
-    /**
-     * Return estimated power (in mAs) of sending a byte with the mobile radio.
-     */
-    private double getMobilePowerPerByte() {
-        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
-        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                / 3600;
-
-        final long mobileRx = mStats.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
-        final long mobileTx = mStats.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
-        final long mobileData = mobileRx + mobileTx;
-
-        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
-        final long mobileBps = radioDataUptimeMs != 0
-                ? mobileData * 8 * 1000 / radioDataUptimeMs
-                : MOBILE_BPS;
-
-        return MOBILE_POWER / (mobileBps / 8);
-    }
-
-    /**
-     * Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
-     */
-    private double getWifiPowerPerByte() {
-        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
-        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
-                / 3600;
-        return WIFI_POWER / (WIFI_BPS / 8);
-    }
-
-    private void processMiscUsage() {
-        final int which = mStatsType;
-        long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
-        final long timeSinceUnplugged = uSecNow;
-        if (DEBUG) {
-            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
-        }
-
-        addUserUsage();
-        addPhoneUsage(uSecNow);
-        addScreenUsage(uSecNow);
-        addWiFiUsage(uSecNow);
-        addBluetoothUsage(uSecNow);
-        addIdleUsage(uSecNow); // Not including cellular idle power
-        // Don't compute radio usage if it's a wifi-only device
-        if (!com.android.settings.Utils.isWifiOnly(getActivity())) {
-            addRadioUsage(uSecNow);
-        }
-    }
-
-    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
-            double power) {
-        if (power > mMaxPower) mMaxPower = power;
-        mTotalPower += power;
-        BatterySipper bs = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                label, drainType, iconId, null, new double[] {power});
-        bs.usageTime = time;
-        bs.iconId = iconId;
-        mUsageList.add(bs);
-        return bs;
-    }
-
-    private void load() {
-        try {
-            byte[] data = mBatteryInfo.getStatistics();
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(data, 0, data.length);
-            parcel.setDataPosition(0);
-            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
-                    .createFromParcel(parcel);
-            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException:", e);
-        }
-    }
-
-    public void run() {
-        while (true) {
-            BatterySipper bs;
-            synchronized (mRequestQueue) {
-                if (mRequestQueue.isEmpty() || mAbort) {
-                    mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
-                    mRequestThread = null;
-                    return;
-                }
-                bs = mRequestQueue.remove(0);
-            }
-            bs.getNameIcon();
-        }
-    }
-
-    static final int MSG_UPDATE_NAME_ICON = 1;
-    static final int MSG_REPORT_FULLY_DRAWN = 2;
-
     Handler mHandler = new Handler() {
 
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case MSG_UPDATE_NAME_ICON:
+                case BatteryStatsHelper.MSG_UPDATE_NAME_ICON:
                     BatterySipper bs = (BatterySipper) msg.obj;
-                    PowerGaugePreference pgp = 
+                    PowerGaugePreference pgp =
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
@@ -937,7 +248,7 @@
                         pgp.setTitle(bs.name);
                     }
                     break;
-                case MSG_REPORT_FULLY_DRAWN:
+                case BatteryStatsHelper.MSG_REPORT_FULLY_DRAWN:
                     getActivity().reportFullyDrawn();
                     break;
             }
diff --git a/src/com/android/settings/location/InjectedSetting.java b/src/com/android/settings/location/InjectedSetting.java
new file mode 100644
index 0000000..01d3236
--- /dev/null
+++ b/src/com/android/settings/location/InjectedSetting.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Intent;
+
+/**
+ * Specifies a setting that is being injected into Settings > Location > Location services.
+ *
+ * @see android.location.SettingInjectorService
+ */
+class InjectedSetting {
+
+    /**
+     * Package for the subclass of {@link android.location.SettingInjectorService} and for the
+     * settings activity.
+     */
+    public final String packageName;
+
+    /**
+     * Class name for the subclass of {@link android.location.SettingInjectorService} that
+     * specifies dynamic values for the location setting.
+     */
+    public final String className;
+
+    /**
+     * The {@link android.preference.Preference#getTitle()} value.
+     */
+    public final String title;
+
+    /**
+     * The {@link android.preference.Preference#getIcon()} value.
+     */
+    public final int iconId;
+
+    /**
+     * The activity to launch to allow the user to modify the settings value. Assumed to be in the
+     * {@link #packageName} package.
+     */
+    public final String settingsActivity;
+
+    public InjectedSetting(String packageName, String className,
+            String title, int iconId, String settingsActivity) {
+        this.packageName = packageName;
+        this.className = className;
+        this.title = title;
+        this.iconId = iconId;
+        this.settingsActivity = settingsActivity;
+    }
+
+    @Override
+    public String toString() {
+        return "InjectedSetting{" +
+                "mPackageName='" + packageName + '\'' +
+                ", mClassName='" + className + '\'' +
+                ", label=" + title +
+                ", iconId=" + iconId +
+                ", settingsActivity='" + settingsActivity + '\'' +
+                '}';
+    }
+
+    /**
+     * Returns the intent to start the {@link #className} service.
+     */
+    public Intent getServiceIntent() {
+        Intent intent = new Intent();
+        intent.setClassName(packageName, className);
+        return intent;
+    }
+}
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index 4cb3a5e..7001126 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -53,17 +53,11 @@
     public void onResume() {
         super.onResume();
         createPreferenceHierarchy();
-        mHighAccuracy.resume();
-        mBatterySaving.resume();
-        mSensorsOnly.resume();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mHighAccuracy.pause();
-        mBatterySaving.pause();
-        mSensorsOnly.pause();
     }
 
     private PreferenceScreen createPreferenceHierarchy() {
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 97907de..e349ad4 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -19,23 +19,23 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
-import android.util.Log;
 import android.view.Gravity;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import com.android.settings.R;
+import com.android.settings.fuelgauge.BatteryStatsHelper;
 
 /**
  * Location access settings.
  */
 public class LocationSettings extends LocationSettingsBase
         implements CompoundButton.OnCheckedChangeListener {
-    private static final String TAG = LocationSettings.class.getSimpleName();
     /** Key for preference screen "Mode" */
     private static final String KEY_LOCATION_MODE = "location_mode";
     /** Key for preference category "Recent location requests" */
@@ -49,6 +49,8 @@
     private PreferenceCategory mRecentLocationRequests;
     private PreferenceCategory mLocationServices;
 
+    private BatteryStatsHelper mStatsHelper;
+
     public LocationSettings() {
         mValidListener = false;
     }
@@ -60,6 +62,18 @@
     }
 
     @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mStatsHelper = new BatteryStatsHelper(activity, null);
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mStatsHelper.create(icicle);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mSwitch = new Switch(getActivity());
@@ -73,6 +87,13 @@
         super.onPause();
         mValidListener = false;
         mSwitch.setOnCheckedChangeListener(null);
+        mStatsHelper.pause();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mStatsHelper.destroy();
     }
 
     private PreferenceScreen createPreferenceHierarchy() {
@@ -88,9 +109,8 @@
                 new Preference.OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        PreferenceActivity preferenceActivity =
-                                (PreferenceActivity) getActivity();
-                        preferenceActivity.startPreferencePanel(
+                        PreferenceActivity activity = (PreferenceActivity) getActivity();
+                        activity.startPreferencePanel(
                                 LocationMode.class.getName(), null,
                                 R.string.location_mode_screen_title, null, LocationSettings.this,
                                 0);
@@ -101,28 +121,24 @@
                 (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
         mLocationServices = (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
 
-        Activity activity = getActivity();
-
-        RecentLocationApps recentApps = new RecentLocationApps(activity);
+        PreferenceActivity activity = (PreferenceActivity) getActivity();
+        RecentLocationApps recentApps = new RecentLocationApps(activity, mStatsHelper);
         recentApps.fillAppList(mRecentLocationRequests);
 
-        if (activity instanceof PreferenceActivity) {
-            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
-            // Only show the master switch when we're not in multi-pane mode, and not being used as
-            // Setup Wizard.
-            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
-                final int padding = activity.getResources().getDimensionPixelSize(
-                        R.dimen.action_bar_switch_padding);
-                mSwitch.setPaddingRelative(0, 0, padding, 0);
-                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                        ActionBar.DISPLAY_SHOW_CUSTOM);
-                activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END));
-            }
-        } else {
-            Log.wtf(TAG, "Current activity is not an instance of PreferenceActivity!");
+        SettingsInjector.addInjectedSettings(mLocationServices, activity, getPreferenceManager());
+
+        // Only show the master switch when we're not in multi-pane mode, and not being used as
+        // Setup Wizard.
+        if (activity.onIsHidingHeaders() || !activity.onIsMultiPane()) {
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mSwitch.setPaddingRelative(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END));
         }
 
         setHasOptionsMenu(true);
diff --git a/src/com/android/settings/location/RadioButtonPreference.java b/src/com/android/settings/location/RadioButtonPreference.java
index f87bd22..5589dfa 100644
--- a/src/com/android/settings/location/RadioButtonPreference.java
+++ b/src/com/android/settings/location/RadioButtonPreference.java
@@ -19,9 +19,7 @@
 import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.android.settings.R;
@@ -37,8 +35,6 @@
  * uncheck all the other preferences, you should do that by code yourself.
  */
 public class RadioButtonPreference extends CheckBoxPreference {
-    private boolean mValidListener;
-
     public interface OnClickListener {
         public abstract void onRadioButtonClicked(RadioButtonPreference emiter);
     }
@@ -48,7 +44,6 @@
     public RadioButtonPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
-        mValidListener = false;
     }
 
     public RadioButtonPreference(Context context, AttributeSet attrs) {
@@ -63,14 +58,6 @@
         mListener = listener;
     }
 
-    public void pause() {
-        mValidListener = false;
-    }
-
-    public void resume() {
-        mValidListener = true;
-    }
-
     @Override
     public void onClick() {
         if (mListener != null) {
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index 113928f..fe206b5 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -20,14 +20,22 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
 import com.android.settings.R;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.fuelgauge.BatterySipper;
+import com.android.settings.fuelgauge.BatteryStatsHelper;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Retrieves the information of applications which accessed location recently.
@@ -37,12 +45,52 @@
 
     private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
 
-    private Context mContext;
-    PackageManager mPackageManager;
+    private final PreferenceActivity mActivity;
+    private final BatteryStatsHelper mStatsHelper;
+    private final PackageManager mPackageManager;
 
-    public RecentLocationApps(Context context) {
-        mContext = context;
-        mPackageManager = context.getPackageManager();
+    // Stores all the packages that requested location within the designated interval
+    // key - package name of the app
+    // value - whether the app has requested high power location
+
+    public RecentLocationApps(PreferenceActivity activity, BatteryStatsHelper sipperUtil) {
+        mActivity = activity;
+        mPackageManager = activity.getPackageManager();
+        mStatsHelper = sipperUtil;
+    }
+
+    private class UidEntryClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private BatterySipper mSipper;
+
+        public UidEntryClickedListener(BatterySipper sipper) {
+            mSipper = sipper;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            mStatsHelper.startBatteryDetailPage(mActivity, mSipper);
+            return true;
+        }
+    }
+
+    private class PackageEntryClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private String mPackage;
+
+        public PackageEntryClickedListener(String packageName) {
+            mPackage = packageName;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            Bundle args = new Bundle();
+            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
+            mActivity.startPreferencePanel(InstalledAppDetails.class.getName(), args,
+                    R.string.application_info_label, null, null, 0);
+            return true;
+        }
     }
 
     /**
@@ -50,17 +98,68 @@
      * specified time.
      */
     public void fillAppList(PreferenceCategory container) {
+        HashMap<String, Boolean> packageMap = new HashMap<String, Boolean>();
         AppOpsManager aoManager =
-                (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
+                (AppOpsManager) mActivity.getSystemService(Context.APP_OPS_SERVICE);
         List<AppOpsManager.PackageOps> appOps = aoManager.getPackagesForOps(
                 new int[] {
                     AppOpsManager.OP_MONITOR_LOCATION,
-                AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION,
                 });
         PreferenceManager preferenceManager = container.getPreferenceManager();
         long now = System.currentTimeMillis();
         for (AppOpsManager.PackageOps ops : appOps) {
-            processPackageOps(now, container, preferenceManager, ops);
+            processPackageOps(now, container, preferenceManager, ops, packageMap);
+        }
+
+        mStatsHelper.refreshStats();
+        List<BatterySipper> usageList = mStatsHelper.getUsageList();
+        for (BatterySipper sipper : usageList) {
+            sipper.loadNameAndIcon();
+            String[] packages = sipper.getPackages();
+            if (packages == null) {
+                continue;
+            }
+            for (String curPackage : packages) {
+                if (packageMap.containsKey(curPackage)) {
+                    PreferenceScreen screen = preferenceManager.createPreferenceScreen(mActivity);
+                    screen.setIcon(sipper.getIcon());
+                    screen.setTitle(sipper.getLabel());
+                    if (packageMap.get(curPackage)) {
+                        screen.setSummary(R.string.location_high_battery_use);
+                    } else {
+                        screen.setSummary(R.string.location_low_battery_use);
+                    }
+                    container.addPreference(screen);
+                    screen.setOnPreferenceClickListener(new UidEntryClickedListener(sipper));
+                    packageMap.remove(curPackage);
+                    break;
+                }
+            }
+        }
+
+        // Typically there shouldn't be any entry left in the HashMap. But if there are any, add
+        // them to the list and link them to the app info page.
+        for (Map.Entry<String, Boolean> entry : packageMap.entrySet()) {
+            try {
+                PreferenceScreen screen = preferenceManager.createPreferenceScreen(mActivity);
+                ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+                        entry.getKey(), PackageManager.GET_META_DATA);
+                screen.setIcon(mPackageManager.getApplicationIcon(appInfo));
+                screen.setTitle(mPackageManager.getApplicationLabel(appInfo));
+                // if used both high and low battery within the time interval, show as "high
+                // battery"
+                if (entry.getValue()) {
+                    screen.setSummary(R.string.location_high_battery_use);
+                } else {
+                    screen.setSummary(R.string.location_low_battery_use);
+                }
+                screen.setOnPreferenceClickListener(
+                        new PackageEntryClickedListener(entry.getKey()));
+                container.addPreference(screen);
+            } catch (PackageManager.NameNotFoundException e) {
+                // ignore the current app and move on to the next.
+            }
         }
     }
 
@@ -68,7 +167,8 @@
             long now,
             PreferenceCategory container,
             PreferenceManager preferenceManager,
-            AppOpsManager.PackageOps ops) {
+            AppOpsManager.PackageOps ops,
+            HashMap<String, Boolean> packageMap) {
         String packageName = ops.getPackageName();
         List<AppOpsManager.OpEntry> entries = ops.getOps();
         boolean highBattery = false;
@@ -96,22 +196,6 @@
             return;
         }
 
-        try {
-            PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
-            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
-                    packageName, PackageManager.GET_META_DATA);
-            screen.setIcon(mPackageManager.getApplicationIcon(appInfo));
-            screen.setTitle(mPackageManager.getApplicationLabel(appInfo));
-            // if used both high and low battery within the time interval, show as "high
-            // battery"
-            if (highBattery) {
-                screen.setSummary(R.string.location_high_battery_use);
-            } else {
-                screen.setSummary(R.string.location_low_battery_use);
-            }
-            container.addPreference(screen);
-        } catch (PackageManager.NameNotFoundException e) {
-            // ignore the current app and move on to the next.
-        }
+        packageMap.put(packageName, highBattery);
     }
 }
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
new file mode 100644
index 0000000..258f3fd
--- /dev/null
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.R;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.location.SettingInjectorService;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
+ *
+ * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}. We do not use that
+ * class directly because it is not a good match for our use case: we do not need the caching, and
+ * so do not want the additional resource hit at app install/upgrade time; and we would have to
+ * suppress the tie-breaking between multiple services reporting settings with the same name.
+ * Code-sharing would require extracting {@link
+ * android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources,
+ * String, android.util.AttributeSet)} into an interface, which didn't seem worth it.
+ */
+class SettingsInjector {
+
+    private static final String TAG = "SettingsInjector";
+
+    /**
+     * Intent action marking the receiver as injecting a setting
+     */
+    public static final String RECEIVER_INTENT = "com.android.settings.InjectedLocationSetting";
+
+    /**
+     * Name of the meta-data tag used to specify the resource file that includes the settings
+     * attributes.
+     */
+    public static final String META_DATA_NAME = "com.android.settings.InjectedLocationSetting";
+
+    /**
+     * Name of the XML tag that includes the attributes for the setting.
+     */
+    public static final String ATTRIBUTES_NAME = "injected-location-setting";
+
+    /**
+     * Intent action a client should broadcast when the value of one of its injected settings has
+     * changed, so that the setting can be updated in the UI.
+     *
+     * TODO: register a broadcast receiver that calls updateUI() when it receives this intent
+     */
+    public static final String UPDATE_INTENT =
+            "com.android.settings.InjectedLocationSettingChanged";
+
+    /**
+     * Returns a list with one {@link InjectedSetting} object for each {@link android.app.Service}
+     * that responds to {@link #RECEIVER_INTENT} and provides the expected setting metadata.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     *
+     * TODO: sort alphabetically
+     *
+     * TODO: unit test
+     */
+    public static List<InjectedSetting> getSettings(Context context) {
+        PackageManager pm = context.getPackageManager();
+        Intent receiverIntent = new Intent(RECEIVER_INTENT);
+
+        List<ResolveInfo> resolveInfos =
+                pm.queryIntentServices(receiverIntent, PackageManager.GET_META_DATA);
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Found services: " + resolveInfos);
+        }
+        List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size());
+        for (ResolveInfo receiver : resolveInfos) {
+            try {
+                InjectedSetting info = parseServiceInfo(receiver, pm);
+                if (info == null) {
+                    Log.w(TAG, "Unable to load service info " + receiver);
+                } else {
+                    if (Log.isLoggable(TAG, Log.INFO)) {
+                        Log.i(TAG, "Loaded service info: " + info);
+                    }
+                    settings.add(info);
+                }
+            } catch (XmlPullParserException e) {
+                Log.w(TAG, "Unable to load service info " + receiver, e);
+            } catch (IOException e) {
+                Log.w(TAG, "Unable to load service info " + receiver, e);
+            }
+        }
+
+        return settings;
+    }
+
+    /**
+     * Parses {@link InjectedSetting} from the attributes of the {@link #META_DATA_NAME} tag.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     */
+    private static InjectedSetting parseServiceInfo(ResolveInfo service, PackageManager pm)
+            throws XmlPullParserException, IOException {
+
+        ServiceInfo si = service.serviceInfo;
+
+        XmlResourceParser parser = null;
+        try {
+            parser = si.loadXmlMetaData(pm, META_DATA_NAME);
+            if (parser == null) {
+                throw new XmlPullParserException("No " + META_DATA_NAME
+                        + " meta-data for " + service + ": " + si);
+            }
+
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+
+            String nodeName = parser.getName();
+            if (!ATTRIBUTES_NAME.equals(nodeName)) {
+                throw new XmlPullParserException("Meta-data does not start with "
+                        + ATTRIBUTES_NAME + " tag");
+            }
+
+            Resources res = pm.getResourcesForApplication(si.applicationInfo);
+            return parseAttributes(si.packageName, si.name, res, attrs);
+        } catch (PackageManager.NameNotFoundException e) {
+            throw new XmlPullParserException(
+                    "Unable to load resources for package " + si.packageName);
+        } finally {
+            if (parser != null) {
+                parser.close();
+            }
+        }
+    }
+
+    private static InjectedSetting parseAttributes(
+            String packageName, String className, Resources res, AttributeSet attrs) {
+
+        TypedArray sa = res.obtainAttributes(attrs, R.styleable.InjectedLocationSetting);
+        try {
+            // Note that to help guard against malicious string injection, we do not allow dynamic
+            // specification of the label (setting title)
+            final int labelId = sa.getResourceId(R.styleable.InjectedLocationSetting_label, 0);
+            final String label = sa.getString(R.styleable.InjectedLocationSetting_label);
+            final int iconId = sa.getResourceId(R.styleable.InjectedLocationSetting_icon, 0);
+            final String settingsActivity =
+                    sa.getString(R.styleable.InjectedLocationSetting_settingsActivity);
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "parsed labelId: " + labelId + ", label: " + label
+                        + ", iconId: " + iconId);
+            }
+            if (labelId == 0 || TextUtils.isEmpty(label) || TextUtils.isEmpty(settingsActivity)) {
+                return null;
+            }
+            return new InjectedSetting(packageName, className,
+                    label, iconId, settingsActivity);
+        } finally {
+            sa.recycle();
+        }
+    }
+
+    /**
+     * Add settings that other apps have injected.
+     *
+     * TODO: extract InjectedLocationSettingGetter that returns an iterable over
+     * InjectedSetting objects, so that this class can focus on UI
+     */
+    public static void addInjectedSettings(PreferenceGroup group, Context context,
+            PreferenceManager preferenceManager) {
+
+        Iterable<InjectedSetting> settings = getSettings(context);
+        for (InjectedSetting setting : settings) {
+            Preference pref = addServiceSetting(context, group, setting, preferenceManager);
+
+            // TODO: to prevent churn from multiple live broadcast receivers, don't trigger
+            // the next update until the sooner of: the current update completes or 1-2 seconds
+            // after the current update was started.
+            updateSetting(context, pref, setting);
+        }
+    }
+
+    /**
+     * Adds an injected setting to the root with status "Loading...".
+     */
+    private static PreferenceScreen addServiceSetting(Context context,
+            PreferenceGroup group, InjectedSetting info, PreferenceManager preferenceManager) {
+
+        PreferenceScreen screen = preferenceManager.createPreferenceScreen(context);
+        screen.setTitle(info.title);
+        screen.setSummary("Loading...");
+        PackageManager pm = context.getPackageManager();
+        Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
+        screen.setIcon(icon);
+
+        Intent settingIntent = new Intent();
+        settingIntent.setClassName(info.packageName, info.settingsActivity);
+        screen.setIntent(settingIntent);
+
+        group.addPreference(screen);
+        return screen;
+    }
+
+    /**
+     * Ask the receiver for the current status for the setting, and display it when it replies.
+     */
+    private static void updateSetting(Context context,
+            final Preference pref, final InjectedSetting info) {
+        Handler handler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                Bundle bundle = msg.getData();
+                String status = bundle.getString(SettingInjectorService.STATUS_KEY);
+                boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, info + ": received " + msg + ", bundle: " + bundle);
+                }
+                pref.setSummary(status);
+                pref.setEnabled(enabled);
+            }
+        };
+        Messenger messenger = new Messenger(handler);
+        Intent receiverIntent = info.getServiceIntent();
+        receiverIntent.putExtra(SettingInjectorService.MESSENGER_KEY, messenger);
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, info + ": sending rcv-intent: " + receiverIntent + ", handler: " + handler);
+        }
+        context.startService(receiverIntent);
+    }
+}
diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
index f3217dd..2dd465a 100644
--- a/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -50,6 +50,7 @@
                 CardEmulationManager.EXTRA_SERVICE_COMPONENT);
         String category = intent.getStringExtra(CardEmulationManager.EXTRA_CATEGORY);
 
+        setResult(RESULT_CANCELED);
         if (!buildDialog(component, category)) {
             finish();
         }
@@ -62,6 +63,7 @@
             case BUTTON_POSITIVE:
                 mBackend.setDefaultPaymentApp(mNewDefault);
                 mBackend.setAutoPaymentMode(true);
+                setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
                 break;
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index fa48a3f..c697661 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -140,6 +140,7 @@
 
         mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
         mPlayExample.setOnPreferenceClickListener(this);
+        mPlayExample.setEnabled(false);
 
         mEnginePreferenceCategory = (PreferenceCategory) findPreference(
                 KEY_ENGINE_PREFERENCE_SECTION);
@@ -363,6 +364,9 @@
 
     private boolean isNetworkRequiredForSynthesis() {
         Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
+        if (features == null) {
+          return false;
+        }
         return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
                 !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
     }