Merge "Fix switch bar theme, clean up text appearances"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index cde51de..462f3d6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer jy hierdie ikoon sien, kan jy jou vingerafdruk gebruik vir identifisering of om \'n aankoop te magtig."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Voeg by"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Gedeeltelike vinngerafdruk bespeur. Probeer weer."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Vingerafdruksensor is vuil. Maak dit skoon en probeer weer."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Vinger is te vinnig beweeg. Probeer weer."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Vinger is te stadig beweeg. Probeer weer."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Kon nie verwerk nie. Probeer weer."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardeware nie beskikbaar nie."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Vingerafdruk kan nie geberg word nie. Verwyder asseblief \'n bestaande vingerafdruk."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Vingerafdrukuittelling is bereik. Probeer weer."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripteer tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripteer foon"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Verkieslik Wi-Fi (Gebruik selnetwerk net as Wi-Fi nie beskikbaar is nie)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Verkieslik sellulêr (Gebruik Wi-Fi net as selnetwerk nie beskikbaar is nie)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Net Wi-Fi (Gebruik nooit selnetwerk nie. Kan nie oproepe maak of ontvang as daar nie Wi-Fi is nie)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-oordrag tydens swerwing"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Laat toe dat Wi-Fi-stemoproepe tydens swerwing na selnetwerk oorgedra word"</string>
     <string name="home_settings" msgid="212375129455718176">"Tuis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gebruik GPS, Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gebruik Wi‑Fi en sellulêre netwerke om ligging te bepaal"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skandeer"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skandeer"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- en selnetwerkligging"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Voer jou PIN in om OEM-ontsluit te aktiveer"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Laat OEM-ontsluit toe?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSKUWING: Toestelbeskermingkenmerke sal nie op hierdie toestel werk terwyl hierdie instelling aangeskakel is nie."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Loggerbuffer se groottes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies loggergroottes per logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktiveer aansigkenmerkinspeksie"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Inligtingruiling"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiveer Wi-Fi-woordryke aanmelding"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiewe Wi-Fi na selfoon-oordrag"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Laat altyd Wi-Fi-swerfskanderings toe"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gebruik vorige DHCP-kliënt"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Wys opsies vir draadlose skermsertifisering"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Verhoog Wi-Fi-aantekeningvlak, wys per SSID RSSI in Wi‑Fi-kieser"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Wanneer dit geaktiveer is, sal Wi-Fi meer aggressief wees om die dataverbinding na selfoon oor te dra wanneer die Wi-Fi-sein swak is"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktiveer aansigkenmerkinspeksie"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gebruik eerder die DHCP-kliënt van Lollipop af as die nuwe Android DHCP-kliënt."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-ontfouting is net vir ontwikkelingsdoeleindes bedoel. Gebruik dit om data te kopieer tussen jou rekenaar en jou toestel, programme op jou toestel te installeer sonder kennisgewing en om loglêerdata te lees."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Herroep toegang tot USB-ontfouting vanaf alle rekenaars wat jy voorheen gemagtig het?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS stuur SMS boodskappe boodskapdiens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"sellulêr selfoondiensverskaffer draadloos data 4 g 3 g 2 g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi oproep bel swerwing oordrag"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi oproep bel"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanseerder"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skerm raakskerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dempskerm raakskerm battery"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> programme geïnstalleer, insluitend stelsel- en afgelaaide programme"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7d68084..295dfc4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ይህን አዶ ባዩ ቁጥር፣ ማንነትን ለይቶ ለማወቅ ወይም ግዢን ፈቃድ ለመስጠት የእርስዎን የጣት አሻራ መጠቀም ይችላሉ።"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"አክል"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ቀጣይ"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ከፊል የጣት አሻራ ተገኝቷል። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"የጣት አሻራ አነፍናፊ ቆሽሿል። እባክዎ ያጽዱት እና እንደገና ይሞክሩ።"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"ጣት በጣም በፍጥነት ተንቀሳቅሷል። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"ጣት በጣም በዝግታ ተንቀሳቅሷል። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ሂደትን ለማከናወን አልተቻለም። እንደገና ይሞክሩ።"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ሃርድዌር ሊገኝ አይገኝም።"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"የጣት አሻራ ሊከማች አይችልም። አሁን ያለ የጣት አሻራን እባክዎ ያስወግዱ።"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"የጣት አሻራ ማብቂያ ጊዜ ደርሷል። እንደገና ይሞክሩ።"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"የWi-Fi ተመራጭ (Wi-Fi በማይገኝበት ጊዜ ብቻ ተንቀሳቃሽ ስልክ አውታረ መረብን ይጠቀማል)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"የተንቀሳቃሽ ስልክ ተመራጭ (የተንቀሳቃሽ ስልክ በማይገኝበት ጊዜ ብቻ Wi-Fi ይጠቀማል)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi ብቻ (በጭራሽ የተንቀሳቃሽ ስልክ አውታረ መረብ አይጠቀምም። Wi-Fi የማይገኝ ከሆነ ጥሪዎችን ማድረግ ሆነ መቀበል አይቻልም)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC መልቀቂያ ከአገልግሎት ክልል ውጭ ሲሆን"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ከአገልግሎት ክልል ውጭ ሲሆን የ Wi-Fi ድምጽ ጥሪዎችን መልቀቂያ ወደ ተንቀሳቃሽ ስልክ አውታረ መረብ ፍቀድ"</string>
     <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"አካባቢ ለማወቅ ጂፒኤስ፣ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"አካባቢ ለማወቅ Wi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረቦችን ተጠቀም"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"በመቃኘት ላይ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"በመቃኘት ላይ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"የWi‑Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM መክፈቻን ለማንቃት የእርስዎን መሣሪያ ፒን ይስገቡ"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"የOEM መክፈቻ ይፈቀድ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ማስጠንቀቂያ፦ ይህ ቅንብር በሚበራበት ጊዜ የመሣሪያ ጥበቃ ባህሪዎች በዚህ መሣሪያ ላይ አይሰሩም።"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"የምዝግብ ማስታወሻ ያዥ መጠኖች"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"በአንድ ምዝግብ ማስታወሻ ቋጥ የሚኖረው የምዝግብ ማስታወሻ ያዥ መጠኖች ይምረጡ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"የእይታ አይነታ ምርመራን አንቃ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"አውታረ መረብ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"የWi‑Fi ተጨማሪ ቃላት ምዝግብ ማስታወሻ መያዝ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"አስገዳጅ የWi‑Fi ወደ ተንቀሳቃሽ ርክክብ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ሁልጊዜ የWi‑Fi ማንቀሳቀስ ቅኝቶችን ይፍቀዱ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"የቆየ የDHCP ደንበኛ ይጠቀሙ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ አማራጮችን አሳይ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"የWi‑Fi ምዝግብ ማስታወሻ አያያዝ ደረጃ ጨምር፣ በWi‑Fi መምረጫ ውስጥ በአንድ SSID RSSI አሳይ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ሲነቃ የWi‑Fi ምልክት ዝቅተኛ ሲሆን Wi‑Fi የውሂብ ግንኙነት ለተንቀሳቃሽ ማስረከብ ላይ ይበልጥ አስገዳጅ ይሆናል"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"የእይታ አይነታ ምርመራን አንቃ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ከአዲሱ የAndroid DHCP ደንበኛ ይልቅ የLollipop DHCP ደንበኛውን ይጠቀሙ።"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"የዩ ኤስ ቢ ማረም መዳረሻ ከዚህ ቀደም ፍቃድ ከሰጧቸው ኮምፒውተሮች ላይ ይሻሩ?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"የwifi wi-fi አውታረ መረብ ግንኙነት"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ጽሑፍ መልዕክት መላክ መልዕክቶች መልዕክት አላላክ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"የተንቀሳቃሽ ስልክ ድምጸ ተያያዥ ሞደም ውሂብ 4ጂ 3ጂ 2ጂ lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ጥሪ መደወል ከአገልግሎት መስጫ ክልል ውጭ መልቀቂያ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ጥሪ መደወል"</string>
     <string name="keywords_home" msgid="3626170808219458848">"አስጀማሪ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ማያ ገጽ ተነኪ ማያ ገጽ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"አጨልም ማያንካ ባትሪ"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ተጭነዋል፣ የስርዓት እና የወረዱ መተግበሪያዎችንም ጨምሮ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 25e3275..3fd4f8a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -370,14 +370,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"يمكنك استخدام بصمة إصبعك متى رأيت هذا الرمز لتحديد الهوية أو الإذن بعملية شراء."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"إضافة"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"التالي"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"تم اكتشاف بصمة الإصبع بشكل جزئي، يرجى إعادة المحاولة."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"جهاز استشعار بصمات الأصابع متسخ، يرجى تنظيفه وإعادة المحاولة."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"تحرك الإصبع بسرعة أكثر مما يجب، يرجى إعادة المحاولة."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"تحرك الإصبع ببطء أكثر مما يجب، يرجى إعادة المحاولة."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"تعذرت المعالجة، يرجى إعادة المحاولة."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"الأجهزة غير متاحة."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"يتعذر تخزين بصمة الإصبع، يرجى إزالة إحدى البصمات الموجودة."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"تم بلوغ مهلة بصمة الإصبع، يرجى إعادة المحاولة."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"التشفير"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"تشفير الهاتف"</string>
@@ -783,8 +775,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏شبكة Wi-Fi مُفضّلة (لا يتم استخدام شبكة الجوّال إلا عند عدم توفر شبكة Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏شبكة الجوّال مُفضّلة (يتم استخدام Wi-Fi فقط عند عدم توفر شبكة الجوّال)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏Wi-Fi فقط (لا يتم استخدام شبكة الجوّال مطلقًا. ولا يمكن إجراء أو تلقي مكالمات عند عدم توفر Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"‏تحويل WFC أثناء التجوال"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"‏السماح بتحويل المكالمات الصوتية عبر Wi-Fi إلى شبكة الجوّال أثناء التجوال"</string>
     <string name="home_settings" msgid="212375129455718176">"الشاشة الرئيسية"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
@@ -1155,10 +1145,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استخدام نظام تحديد المواقع العالمي (GPS) وشبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استخدام شبكات Wi‑Fi وشبكات الجوّال لتحديد الموقع"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استخدام نظام تحديد المواقع العالمي (GPS) في تحديد الموقع"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"البحث عن الموقع"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"البحث عن شبكة لاسلكية"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏موقع شبكة Wi‑Fi وشبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -1488,10 +1476,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏أدخل رقم التعريف الشخصي للجهاز لتمكين إلغاء قفل OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"هل تريد السماح بإلغاء قفل المصنّع الأصلي للجهاز؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"تحذير: لن تعمل ميزات الحماية على هذا الجهاز أثناء تشغيل هذا الإعداد."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"أحجام ذاكرة التخزين المؤقت للتسجيل"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"حدد أحجامًا أكبر لكل ذاكرة تخزين مؤقت للتسجيل"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"تمكين فحص سمة العرض"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"الشبكات"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"شهادة عرض شاشة لاسلكي"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏تمكين تسجيل Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏تسليم Wi-Fi حاد إلى خلوي"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏السماح دائمًا بعمليات فحص Wi-Fi للتجوال"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏استخدام برنامج DHCP القديم"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"عرض خيارات شهادة عرض شاشة لاسلكي"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏زيادة مستوى تسجيل Wi-Fi، وعرض لكل SSID RSSI في منتقي Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏عند تمكينه، سيكون Wi-Fi أكثر حدة في تسليم اتصال البيانات إلى الشبكة الخلوية، وذلك عندما تكون إشارة WiFi منخفضة"</string>
@@ -1503,6 +1498,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"تمكين فحص سمة العرض"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏يمكنك استخدام برنامج DHCP من Lollipop بدلاً من برنامج DHCP الجديد على Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏هل تريد السماح بتصحيح أخطاء USB؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏تم تصميم تصحيح أخطاء USB لأغراض التطوير فقط. يمكن استخدامه لنسخ البيانات بين الكمبيوتر والجهاز، وتثبيت التطبيقات على جهازك بدون تنبيه، وقراءة بيانات السجل."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏هل تريد إلغاء إمكانية الدخول إلى تصحيح أخطاء USB من جميع أجهزة الكمبيوتر التي تم التصريح لها سابقًا؟"</string>
@@ -2403,7 +2399,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"رسالة نصية كتابة رسائل نصية إرسال رسائل"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏خلوي مشغِّل شبكة جوّال لاسلكي بيانات 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi call calling roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"شاشة لمس للشاشة"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"تعتيم شاشة شاشة لمس بطارية"</string>
@@ -2613,4 +2609,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"تم تثبيت <xliff:g id="COUNT">%d</xliff:g> من التطبيقات، بما في ذلك تطبيقات النظام والتطبيقات التي تم تنزيلها"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 540c8a1..e1319f7 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Когато видите тази икона, можете да използвате отпечатъка си за идентификация или за оторизиране на покупка."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Добавяне"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Установен е частичен отпечатък. Моля, опитайте отново."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Сензорът за отпечатъци е мръсен. Моля, почистете го и опитайте отново."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Преместихте пръста си твърде бързо. Моля, опитайте отново."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Преместихте пръста си твърде бавно. Моля, опитайте отново."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Не може да се обработи. Опитайте отново."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Хардуерът не е налице."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Отпечатъкът не може да бъде съхранен. Моля, премахнете съществуващ."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Времето за изчакване за отпечатък изтече. Опитайте отново."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифроване"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на таблета"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на телефона"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Предпочита се Wi-Fi (Използва се клетъчна мрежа само ако не е налице Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Предпочита се клетъчна мрежа (Само ако такава не е налице, се използва Wi-Fi)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само Wi-Fi (Никога не се ползва клет. мрежа. Не могат да се осъщ./получ. обажд., ако не е налице Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Прехвърляне на обажд. през Wi-Fi при роуминг"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Разреш. на прехвърляне на глас. обаждания през Wi-Fi към клет. мрежа при роуминг"</string>
     <string name="home_settings" msgid="212375129455718176">"Начало"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Използване на GPS, Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Използване на Wi‑Fi и клетъчни мрежи за определяне на местоположението"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Използване на GPS за определяне на местоположението"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Сканиране"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканиране"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mестоп. от Wi‑Fi и клет. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Въведете ПИН кода за устройството си, за да активирате OEM отключването"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Да се разреши ли отключване от OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕЖДЕНИЕ: Функциите за защита на устройството няма да работят на това, докато следната настройка е включена."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Размери на регистрационните буфери"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Размер на един рег. буфер: Избор"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Активиране на инспектирането на атрибутите за преглед"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Мрежи"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"„Многословно“ регистр. на Wi‑Fi: Актив."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi към моб. мрежи: Агресивно предав."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Сканирането за роуминг на Wi-Fi да е разрешено винаги"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Използване на наследена клиентска програма за DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показване на опциите за сертифициране на безжичния дисплей"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"По-подробно регистр. на Wi‑Fi – данни за RSSI на SSID в инстр. за избор на Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"При активиране предаването на връзката за данни от Wi-Fi към мобилната мрежа ще е по-агресивно, когато Wi-Fi сигналът е слаб"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Активиране на инспектирането на атрибутите за преглед"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Използване на клиентската програма за DHCP от Lollipop вместо новата програма на Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отстраняването на грешки през USB е предназначено само за програмни цели. Използвайте го за копиране на данни между компютъра и устройството си, за инсталиране на приложения на устройството си без известяване и за четене на регистрационни данни."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Да се отмени ли достъпът до отстраняването на грешки през USB от всички по-рано упълномощени от вас компютри?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"Връзка с WiFi/Wi-Fi мрежа"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстово съобщение изпращане на текстови съобщения съобщения"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"клетъчна мрежа клетка оператор безжична мрежа данни 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"WiFi/Wi-Fi, обаждане, осъществяване на обаждане, роуминг, прехвърляне"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi, Wi-Fi, обаждане, обаждания"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартов панел"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран, сензорен екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затъмнен екран сензорен екран батерия"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Инсталирани са <xliff:g id="COUNT">%d</xliff:g> приложения, включително системните и изтеглените"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 648f3a9..0be91aa 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"যখন আপনি এই আইকন দেখতে পাবেন তখনই আপনি সনাক্ত করার জন্য অথবা একটি ক্রয় করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারেন৷"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"যোগ করুন"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"পরবর্তী"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"আঙ্গুলের ছাপ আংশিক সনাক্ত করা হয়েছে৷ অনুগ্রহ করে আবার চেষ্টা করুন৷"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"আঙ্গুলের ছাপ নেওয়ার সেন্সরটি অপরিস্কার৷ অনুগ্রহ করে পরিষ্কার করে আবার চেষ্টা করুন৷"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"আঙ্গুল অতি দ্রুত সরানো হয়েছে৷ অনুগ্রহ করে আবার চেষ্টা করুন৷"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"আঙ্গুল ধীরে সরানো হয়েছে৷ অনুগ্রহ করে আবার চেষ্টা করুন৷"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"প্রক্রিয়া করতে অক্ষম হয়েছে৷ আবার চেষ্টা করুন৷"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"হার্ডওয়্যার অনুপলব্ধ৷"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"আঙ্গুলের ছাপ সংরক্ষণ করা যাবে না৷ অনুগ্রহ করে একটি বিদ্যমান আঙ্গুলের ছাপ সরান৷"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"আঙ্গুলের ছাপ নেওয়ার সময়সীমা শেষ হযেছে৷ আবার চেষ্টা করুন৷"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"এনক্রিপশান"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ফোন এনক্রিপ্ট করুন"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi পছন্দের (শুধুমাত্র Wi-Fi উপলব্ধ না থাকলে মোবাইল নেটওয়ার্ক ব্যবহার করে)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"সেলুলার পছন্দের (শুধুমাত্র মোবাইল নেটওয়ার্ক উপলব্ধ না থাকলে Wi-Fi ব্যবহার করে)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"শুধুমাত্র Wi-Fi (কখনও মোবাইল নেটওয়ার্ক ব্যবহার করে না৷ Wi-Fi উপলব্ধ না থাকলে কলগুলি করতে বা গ্রহণ করতে পারে না)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"রোমিং-এ থাকার সময় WFC হ্যান্ডঅফ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"রোমিং-এ থাকার সময় Wi-Fi ভয়েস কলগুলিকে সেল নেটওয়ার্কে হ্যান্ডঅফ করার অনুমতি দিন"</string>
     <string name="home_settings" msgid="212375129455718176">"হোম"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
     <string name="sound_settings" msgid="5534671337768745343">"শব্দ"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"অবস্থান নির্ণয় করার জন্য GPS, Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"অবস্থান নির্ণয় করার জন্য Wi‑Fi ও সেলুলার নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"স্ক্যান করা হচ্ছে"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"স্ক্যান করা হচ্ছে"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi ও সেলুলার নেটওয়ার্ক অবস্থান"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM আনলক সক্ষম করতে ডিভাইস PIN লিখুন"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM আনলক করার অনুমতি দিতে চান?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"সতর্কতা: এই ডিভাইসে সেটিংটি চালু থাকা অবস্থায় ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি কাজ করবে না৷"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"লগার বাফারের আকারগুলি"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"লগ বাফার প্রতি অপেক্ষাকৃত বড় আকারগুলির নির্বাচন করুন"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের মঞ্জুরি দিন"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"নেটওয়ার্কিং"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ওয়্যারলেস ডিসপ্লে সার্টিফিকেশন"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ভারবোস লগিং সক্ষম করুন"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi থেকে সেলুলারে তৎপর পরিবর্তন"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"সর্বদা Wifi রোম স্ক্যানকে অনুমতি দিন"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"লেগাসি DHCP ক্লায়েন্ট ব্যবহার করুন"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ওয়্যারলেস প্রদর্শন সার্টিফিকেশন জন্য বিকল্পগুলি দেখান"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi লগিং স্তর বাড়ান, Wi‑Fi চয়নকারীতে SSID RSSI অনুযায়ী দেখান"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"সক্ষম করা থাকলে, নিম্নমানের Wi‑Fi সিগন্যালের ক্ষেত্রে, সেলুলার-এ ডেটা সংযোগ প্রদান করতে Wi‑Fi আরো বেশি শক্তিশালীভাবে কাজ করবে"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের মঞ্জুরি দিন"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"নতুন Android DHCP ক্লায়েন্টের পরিবর্তে Lollipop এর থেকে DHCP ক্লায়েন্ট ব্যবহার করুন৷"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ডিবাগিং মঞ্জুর করবেন?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ডিবাগিং কেবলমাত্র বিকাশ করার উদ্দেশ্যে। আপনার কম্পিউটার এবং আপনার ডিভাইসের মধ্যে ডেটা অনুলিপি করতে এটি ব্যবহার করুন, বিজ্ঞপ্তি ছাড়া আপনার ডিভাইসে অ্যাপ্লিকেশানগুলি ইনস্টল করুন এবং ডেটা লগ পড়ুন।"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"আপনি আগে যে সব কম্পিউটার USB ডিবাগিং এর অ্যাক্সেসের অনুমতি দিয়েছিলেন তা প্রত্যাহার করবেন?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi নেটওয়ার্ক সংযোগ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"পাঠ্য বার্তা পাঠ্য রচনা বার্তাগুলি বার্তালাপ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"সেলুলার ফোন ক্যারিয়ার ওয়্যারলেস ডেটা 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi কল রোমিং হ্যান্ডঅফ কল করছে"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi কল কলিং"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
     <string name="keywords_display" msgid="6709007669501628320">"স্ক্রীন টাচস্ক্রীন"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"হালকা আলো টাচস্ক্রীন ব্যাটারি"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান ইনস্টল করা হয়েছে, সিস্টেমের এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি অন্তর্ভুক্ত রয়েছে"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d151c8a..69ca220 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quan vegis aquesta icona, pots fer servir la teva empremta digital per identificar o per autoritzar una compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Afegeix"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"S\'ha detectat una empremta digital parcial. Torna-ho a provar."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"El sensor d\'empremtes digitals està brut. Neteja\'l i torna-ho a provar."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"El dit s\'ha mogut massa ràpid. Torna-ho a provar."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"El dit s\'ha mogut massa lentament. Torna-ho a provar."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"No es pot processar. Torna-ho a provar."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"No hi ha maquinari disponible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"L\'empremta digital no es pot emmagatzemar. Suprimeix-ne una d\'existent."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"S\'ha esgotat el temps d\'espera per a l\'empremta digital. Torna-ho a provar."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de la tauleta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encripta el telèfon"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferència per la Wi-Fi (es fa servir la xarxa mòbil només si la Wi-Fi no està disponible)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferència per les dades mòbils (només es fa servir la Wi-Fi si la xarxa mòbil no està disponible)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Només Wi-Fi (no s\'utilitza mai la xarxa mòbil; no es poden fer ni rebre trucades si no hi ha Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Pas de connexió Wi-Fi en itin."</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Les trucades de veu per Wi-Fi es poden passar a la xarxa mòbil en itinerància"</string>
     <string name="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Fa servir el GPS, la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Fa servir la Wi-Fi i les xarxes mòbils per determinar la ubicació."</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Anàlisi"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Anàlisi"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Ubicació xarxa Wi‑Fi i mòbil"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Per activar el desbloqueig OEM, introdueix el PIN del dispositiu."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vols permetre el desbloqueig d\'OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTIMENT: les característiques de protecció del dispositiu no funcionaran mentre aquesta opció estigui activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Mides de la memòria cau del registrador"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selecc. mides registr. per memòria"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activa la inspecció de l\'atribut de visualització"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Xarxes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activa el registre detallat de la Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Traspàs agressiu de Wi-Fi a dades mòbils"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permet sempre les anàlisis d\'itinerància de la Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilitza el client DHCP heretat"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra les opcions de certificació de pantalla sense fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Augmenta nivell de registre Wi‑Fi i mostra\'l per SSID RSSI al Selector de Wi‑Fi."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si s\'activa, la Wi-Fi serà més agressiva per traspassar la connexió de dades al mode mòbil quan la senyal de Wi-Fi sigui feble."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activa la inspecció de l\'atribut de visualització"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilitza el client DHCP de Lollipop en lloc del client DHCP d\'Android nou."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuració USB només està indicada per a activitats de desenvolupament. Fes-la servir intercanviar dades entre l\'ordinador i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vols revocar l\'accés a la depuració d\'USB dels ordinadors que has autoritzat anteriorment?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"connexió xarxa wifi wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"missatge de text missatges de text missatges missatgeria"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mòbil telèfon mòbil operador de telefonia mòbil dades sense fil 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi trucar trucades itinerància traspassar"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi trucar trucades"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla tàctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pantalla atenuada pantalla tàctil bateria"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"S\'han instal·lat <xliff:g id="COUNT">%d</xliff:g> aplicacions, incloses les aplicacions del sistema i les baixades"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6aeb6ed..0140fd4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kdykoli se zobrazí tato ikona, můžete se identifikovat nebo autorizovat nákup pomocí svého otisku prstu."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Přidat"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Další"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Byla zjištěna jen část otisku prstu. Zkuste to znovu."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Senzor otisků prstů je znečištěn. Vyčistěte jej a zkuste to znovu."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Pohyb prstem byl příliš rychlý. Zkuste to znovu."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Pohyb prstem byl příliš pomalý. Zkuste to znovu."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Otisk prstu nelze zpracovat. Zkuste to znovu."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware není dostupný."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Otisk prstu nelze uložit. Odstraňte existující otisk prstu."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Časový limit sejmutí otisku prstu vypršel. Zkuste to znovu."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrování telefonu"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferována síť Wi-Fi (mobilní síť bude použita jen v případě nedostupnosti sítě Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferována mobilní síť (síť Wi-Fi bude použita jen v případě nedostupnosti mobilní sítě)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Pouze Wi-Fi (mobilní síť se nepoužívá; je-li Wi-Fi nedostupná, nelze provádět ani přijímat hovory)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Předání hovorů Wi-Fi při roamingu"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Při roamingu povolit předávání hlasových hovorů Wi-Fi do mobilní sítě"</string>
     <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"K určení polohy použít GPS, Wi-Fi a mobilní sítě"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"K určení polohy použít Wi-Fi a mobilní sítě"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"K určení polohy použít GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skenování"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skenování"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Poloha z Wi-Fi a mobilních sítí"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu určování 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>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Chcete-li povolit odemknutí OEM, zadejte kód PIN zařízení."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povolit odemknutí OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNĚNÍ: Pokud bude toto nastavení zapnuto, nebudou v tomto zařízení fungovat funkce ochrany zařízení."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovn. pamětí protokol. nástroje"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vyberte velikosti protokolovacího nástroje na vyrovnávací paměť protokolů"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Povolit kontrolu atributu zobrazení"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sítě"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povolit podrobné protokolování Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresivní předání z Wi-Fi na mobilní síť"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vždy povolit vyhledávání roamingu Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Použít starý klient DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobrazit možnosti certifikace bezdrátového displeje"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zvýší úroveň protokolování Wi‑Fi zobrazenou v SSID a RSSI při výběru sítě Wi‑Fi."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Pokud je tato možnost zapnuta, bude síť Wi-Fi agresivnější při předávání datového připojení mobilní síti při slabém signálu Wi-Fi."</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Povolit kontrolu atributu zobrazení"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Namísto nového klientu DHCP Android použít klient DHCP z verze Lollipop."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladění prostřednictvím rozhraní USB je určeno pouze pro účely vývoje. Použijte je ke kopírování dat mezi počítačem a zařízením, instalaci aplikací do zařízení bez upozornění a čtení dat protokolů."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Zrušit přístup k ladění USB ze všech počítačů, které jste v minulosti autorizovali?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi síť připojení"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová zpráva SMS odesílání zpráv"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilní operátor mobilní data bezdrátový přenos 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi hovor volání roaming předat"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hovor volání"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotykový displej"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ztlumit obrazovka dotykový displej baterie"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Počet nainstalovaných aplikací včetně systémových a stažených aplikací: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 389cd22..92a5abd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikon, kan du bruge dit fingeraftryk til brugeridentifikation eller til at godkende et køb."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tilføj"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Næste"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Der blev registreret et delvist fingeraftryk. Prøv igen."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Sensoren til registrering af fingeraftryk er beskidt. Tør den af, og prøv igen."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Du bevægede fingeren for hurtigt. Prøv igen."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Du bevægede fingeren for langsomt. Prøv igen."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Registreringen kan ikke gennemføres. Prøv igen."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardwaren er ikke tilgængelig."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingeraftrykket kan ikke gemmes. Fjern et eksisterende fingeraftryk."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Registrering af fingeraftryk fik timeout. Prøv igen."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi er foretrukket (Bruger kun mobilnetværk, hvis Wi-Fi ikke er tilgængeligt)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilnetværk er foretrukket (Bruger Wi-Fi, hvis mobilnetværk ikke er tilgængeligt)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Kun Wi-Fi (Bruger aldrig mobilnetværk. Det er ikke muligt at foretage/modtage opkald uden Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-videregivelse ved roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Tillad, at taleopkald via Wi-Fi videregives til mobilnetværk under roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Startskærm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Brug GPS, Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Brug Wi-Fi- og mobilnetværk til at fastslå din placering"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Søger"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søger"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Placering via Wi-Fi og mobilnetværk"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Indtast pinkoden for din enhed for at aktivere OEM-oplåsning"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillade OEM-oplåsning?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL! Funktioner, der beskytter enheden, fungerer ikke på denne enhed, når denne indstilling er slået til."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Størrelser for Logger-buffer"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vælg Logger-størrelser pr. logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér visning af attributinspektion"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netværk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivér detaljeret Wi-Fi-logføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Gennemtving skift fra Wi-Fi til mobildata"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillad altid scanning af Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Brug ældre DHCP-klient"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis valgmuligheder for certificering af trådløs skærm"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Øg mængden af Wi‑Fi-logføring. Vis opdelt efter SSID RSSI i Wi‑Fi-vælgeren"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Når dette er aktiveret, gennemtvinges en overdragelse af dataforbindelsen fra Wi-Fi til mobilnetværk, når Wi-Fi-signalet er svagt"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér visning af attributinspektion"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Brug DHCP-klienten fra Lollipop i stedet for den nye DHCP-klient fra Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-fejlretning er kun beregnet til udvikling og kan bruges til at kopiere data mellem din computer og enheden, installere apps på enheden uden meddelelser og læse logdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vil du ophæve adgangen til USB-fejlfinding for alle computere, du tidligere har godkendt?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netværk forbindelse"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sms besked beskeder chat"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil mobilselskab trådløst netværk data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ring op opkald roaming videregivelse"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ring op opkald"</string>
     <string name="keywords_home" msgid="3626170808219458848">"starter"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skærm berøringsskærm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dæmpe skærm touchskærm batteri"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps er installeret, herunder systemapps og downloadede apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 42a722d..1cd6044 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wenn Sie dieses Symbol sehen, können Sie Ihren Fingerabdruck zur Identifizierung oder zur Autorisierung eines Kaufs verwenden."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Hinzufügen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Weiter"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Fingerabdruck teilweise erkannt. Versuchen Sie es erneut."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerabdrucksensor ist verschmutzt. Reinigen Sie ihn und versuchen Sie es erneut."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger zu schnell bewegt. Versuchen Sie es erneut."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger zu langsam bewegt. Versuchen Sie es erneut."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unbrauchbar. Versuchen Sie es erneut."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware nicht verfügbar"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerabdruck kann nicht gespeichert werden. Entfernen Sie einen vorhandenen Fingerabdruck."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Zeitüberschreitung für Fingerabdruck. Versuchen Sie es erneut."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
@@ -752,8 +744,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"WLAN bevorzugt (Mobilfunk wird nur verwendet, wenn kein WLAN verfügbar ist)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilfunk bevorzugt (WLAN wird nur verwendet, wenn kein Mobilfunknetz verfügbar ist)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Nur WLAN (Mobilfunk wird nie verwendet, Anruffunktion ohne WLAN-Verbindung nicht verfügbar)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WLAN-Anrufübergabe bei Roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Bei Roaming Übergabe von WLAN-Sprachanrufen an Mobilfunknetz zulassen"</string>
     <string name="home_settings" msgid="212375129455718176">"Startseite"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
@@ -1120,10 +1110,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"WLAN- und Mobilfunknetze zur Standortbestimmung verwenden"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Standort per WLAN und Mobilfunk"</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>
@@ -1453,10 +1441,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Zum Aktivieren der OEM-Entsperrung Geräte-PIN eingeben"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-Entsperrung zulassen?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Achtung: Die Geräteschutzfunktionen funktionieren auf diesem Gerät nicht, solange diese Einstellung aktiviert ist."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-Puffergrößen"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Größe pro Protokollpuffer wählen"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Inspektion der Anzeigeattribute aktivieren"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netzwerke"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ausführliche WLAN-Protokolle aktivieren"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressives Handover von WLAN an Mobilfunk"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"WLAN-Roamingsuchen immer zulassen"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Alten DHCP-Client verwenden"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Level für WLAN-Protokollierung erhöhen, in WiFi Picker pro SSID-RSSI anzeigen"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Wenn diese Option aktiviert ist, ist WLAN bei schwachem Signal bei der Übergabe der Datenverbindung an den Mobilfunk aggressiver."</string>
@@ -1468,6 +1463,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Inspektion der Anzeigeattribute aktivieren"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP-Client von Lollipop statt des neuen Android-DHCP-Clients verwenden"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-Debugging ist nur für Entwicklungszwecke vorgesehen. Damit können Sie Daten zwischen Ihrem Computer und Ihrem Gerät kopieren, Apps auf Ihrem Gerät ohne Benachrichtigung installieren und Protokolldaten lesen."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Zugriff auf USB-Debugging für alle zuvor autorisierten Computer aufheben?"</string>
@@ -2368,7 +2364,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wlan wifi wi-fi netzwerkverbindung"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textnachricht sms nachrichten messaging mms"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilfunk mobilfunkanbieter drahtlos drahtlose daten 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wlan wifi wi-fi anruf anrufen roaming übergabe"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WLAN-Anrufe"</string>
     <string name="keywords_home" msgid="3626170808219458848">"übersicht launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"bildschirm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"display dimmen touchscreen akku"</string>
@@ -2566,4 +2562,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> Apps installiert, einschließlich System-Apps und heruntergeladener Apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0a77cef..98864f0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Όποτε βλέπετε αυτό το εικονίδιο, μπορείτε να χρησιμοποιείτε το μοναδικό χαρακτηριστικό σας για την ταυτοποίηση ή την εξουσιοδότηση μιας αγοράς."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Προσθήκη"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Επόμενο"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Εντοπίστηκε μερικό μοναδικό χαρακτηριστικό. Δοκιμάστε ξανά."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Ο αισθητήρας μοναδικού χαρακτηριστικού δεν είναι καθαρός. Καθαρίστε τον και δοκιμάστε ξανά."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Πολύ γρήγορη κίνηση δαχτύλου. Δοκιμάστε ξανά."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Πολύ αργή κίνηση δαχτύλου. Δοκιμάστε ξανά."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Δεν είναι δυνατή η επεξεργασία. Δοκιμάστε ξανά."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Ο εξοπλισμός δεν είναι διαθέσιμος."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Δεν είναι δυνατή η αποθήκευση μοναδικού χαρακτηριστικού. Καταργήστε το υπάρχον μοναδικό χαρακτηριστικό."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Λήξη χρονικού ορίου μοναδικού χαρακτηριστικού. Δοκιμάστε ξανά."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Προτίμηση Wi-Fi (Χρησιμοποιεί δίκτυο κινητής τηλεφωνίας μόνο εάν δεν υπάρχει διαθέσιμο Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Προτίμηση δικτύου κινητής τηλεφωνίας (Χρήση Wi-Fi μόνο αν δεν υπάρχει δίκτυο κινητής τηλεφωνίας)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Μόνο Wi-Fi (Χωρίς χρήση δικτύου κιν.τηλεφωνίας. Αδύνατη πραγματοποίηση ή λήψη κλήσεων χωρίς Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Μεταβίβαση WFC σε περιαγωγή"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Ενεργοποίηση μεταβίβασης φων.κλήσεων Wi-Fi σε δίκτυο κιν.τηλεφωνίας σε περιαγωγή"</string>
     <string name="home_settings" msgid="212375129455718176">"Αρχική σελίδα"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
@@ -1450,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Εισαγάγετε το PIN της συσκευής σας για να ενεργοποιήσετε το ξεκλείδωμα OEM."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Να επιτρέπεται το ξεκλείδωμα OEM;"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Οι λειτουργίες προστασίας συσκευής δεν θα λειτουργούν σε αυτήν τη συσκευή, όταν είναι ενεργοποιημένη αυτή η ρύθμιση."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Μέγεθος προσωρινής μνήμης για τη λειτουργία καταγραφής"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Επιλ.μεγ. για λειτ.κατ.ανά μέγ.πρ.μνήμ. καταγρ."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ενεργοποίηση του ελέγχου χαρακτηριστικών προβολής"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Δικτύωση"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Πιστοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ενεργοποίηση λεπτομερ. καταγραφής Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Επιθ.μεταβ. Wi-Fi σε δίκτυο κιν.τηλ."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Να επιτρέπεται πάντα η σάρωση Wi-Fi κατά την περιαγωγή"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Χρήση εφαρμογής-πελάτη DHCP παλαιού τύπου"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Εμφάνιση επιλογών για πιστοποίηση ασύρματης οθόνης"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Αύξηση επιπέδου καταγ. Wi-Fi, εμφάνιση ανά SSID RSSI στο εργαλείο επιλογής Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Όταν είναι ενεργό, το Wi-Fi θα μεταβιβάζει πιο επιθετικά τη σύνδ.δεδομένων σε δίκτυο κινητής τηλ., όταν το σήμα Wi-Fi είναι χαμηλό"</string>
@@ -1465,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ενεργοποίηση του ελέγχου χαρακτηριστικών προβολής"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Χρήση εφαρμογής-πελάτη DHCP παλαιού τύπου από το Lollipop αντί για τη νέα εφαρμογή-πελάτη DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ο εντοπισμός σφαλμάτων USB προορίζεται μόνο για σκοπούς προγραμματισμού. Χρησιμοποιήστε τον για αντιγραφή δεδομένων μεταξύ του υπολογιστή και της συσκευής σας, για την εγκατάσταση εφαρμογών στη συσκευή σας χωρίς προειδοποίηση και για την ανάγνωση δεδομένων καταγραφής."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Ανάκληση πρόσβασης στον εντοπισμό σφαλμάτων USB από όλους τους υπολογιστές για τους οποίους είχατε εξουσιοδότηση στο παρελθόν;"</string>
@@ -2367,7 +2365,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi σύνδεση δικτύου"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"μήνυμα κειμένου ανταλλαγή μηνυμάτων κειμένου μηνύματα ανταλλαγή μηνυμάτων"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"δίκτυο κινητής τηλεφωνίας κελί εταιρεία κινητής τηλεφωνίας ασύρματα δεδομένα 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"Wi-Fi κλήση Wi-Fi κλήσεις περιαγωγή μεταβίβαση"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi κλήση Wi-Fi κλήσεις"</string>
     <string name="keywords_home" msgid="3626170808219458848">"λειτουργία εκκίνησης"</string>
     <string name="keywords_display" msgid="6709007669501628320">"οθόνη αφής"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"μείωση φωτεινότητας οθόνης οθόνη αφής μπαταρία"</string>
@@ -2565,4 +2563,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Εγκαταστάθηκαν <xliff:g id="COUNT">%d</xliff:g> εφαρμογές, συμπεριλαμβανομένων των εφαρμογών συστήματος και των λήψεων εφαρμογών"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a29b85d..5f33309 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Partial fingerprint detected. Please try again."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerprint sensor is dirty. Please clean and try again."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger moved to fast. Please try again."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger moved to slow. Please try again."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unable to process. Try again."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware not available."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Fingerprint timeout reached. Try again."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC handoff while roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Allow Wi-Fi voice calls handoff to mobile network when roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi call calling roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a29b85d..5f33309 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Partial fingerprint detected. Please try again."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerprint sensor is dirty. Please clean and try again."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger moved to fast. Please try again."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger moved to slow. Please try again."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unable to process. Try again."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware not available."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Fingerprint timeout reached. Try again."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC handoff while roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Allow Wi-Fi voice calls handoff to mobile network when roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi call calling roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a29b85d..5f33309 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Whenever you see this icon, you can use your fingerprint for identification or to authorise a purchase."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Add"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Next"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Partial fingerprint detected. Please try again."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingerprint sensor is dirty. Please clean and try again."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Finger moved to fast. Please try again."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Finger moved to slow. Please try again."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Unable to process. Try again."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware not available."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Fingerprint timeout reached. Try again."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC handoff while roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Allow Wi-Fi voice calls handoff to mobile network when roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Use GPS, Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Use Wi‑Fi and mobile networks to determine location"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Use GPS to determine location"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanning"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Always allow Wi‑Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Use legacy DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Increase Wi‑Fi logging level, show per SSID RSSI in Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"When enabled, Wi‑Fi will be more aggressive in handing over the data connection to Mobile, when Wi‑Fi signal is low"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Enable view attribute inspection"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use the DHCP client from Lollipop instead of the new Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobile network mobile operator wireless data 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi call calling roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dim screen touchscreen battery"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7f0d919..6922939 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -348,8 +348,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital registrada</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. huella digital"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (1892198885652894680) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"A fin de utilizar tu huella digital para desbloquear la pantalla o confirmar compras, tendremos que: \n\n✓ configurar el método de bloqueo de pantalla alternativo; \n\n✓ agregar tu huella digital."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar el sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Busca el sensor de huellas digitales en la parte posterior del teléfono."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nombre"</string>
@@ -363,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando veas este ícono, podrás utilizar tu huella digital para identificarte o para autorizar una compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Agregar"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"La huella digital se detectó parcialmente. Vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"El sensor de huellas digitales está sucio. Limpia el sensor y vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Moviste el dedo muy rápido. Vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Moviste el dedo muy despacio. Vuelve a intentarlo."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"No se puede procesar. Vuelve a intentarlo."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"El hardware no está disponible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"No se puede almacenar la huella digital. Elimina una de las existentes."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Finalizó el tiempo de espera para la huella digital. Vuelve a intentarlo."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dispositivo"</string>
@@ -752,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Red Wi-Fi preferida (utiliza la red móvil solo si no hay Wi-Fi disponible)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Red móvil preferida (utiliza Wi-Fi únicamente si la red móvil no está disponible)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo Wi-Fi (nunca usa la red móvil, no puedes hacer ni recibir llamadas si no hay conexión Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transf. llam. Wi-Fi en roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permitir transferencia de llamadas de voz por Wi-Fi a la red móvil en roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -1120,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Determinar ubicación con GPS, Wi‑Fi y redes móviles"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Determinar ubicación con Wi‑Fi y redes móviles"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1453,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ingresa el PIN del dispositivo para habilitar el desbloqueo OEM."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección de dispositivos no funcionarán en este dispositivo mientras esta configuración esté activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tamaños Logger/búfer registro"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro detallado de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia intensa de Wi‑Fi a celular"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir siempre búsquedas de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP heredado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar nivel de registro Wi-Fi; mostrar por SSID RSSI en el selector de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si está habilitada, la conexión Wi‑Fi será más intensa al transferir la conexión de datos al celular (si la señal Wi‑Fi es débil)."</string>
@@ -1468,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Usar el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración por USB solo está indicada para actividades de programación. Úsala para copiar datos entre tu computadora y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"¿Quieres revocar el acceso a la depuración por USB desde todas la computadoras que autorizaste hasta ahora?"</string>
@@ -2368,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje de texto, enviar mensajes de texto, mensajería"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, operador de telefonía celular, datos inalámbricos, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi, wi-fi, llamar, llamada, roaming, transferencia"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi, wi-fi, llamar, llamada"</string>
     <string name="keywords_home" msgid="3626170808219458848">"selector"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla, pantalla táctil, batería"</string>
@@ -2393,10 +2388,8 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="4673901601478559100">"restricción restringir restringido"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección de texto, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, palabra ofensiva, tipo, emoji, internacional"</string>
-    <!-- no translation found for keywords_reset_apps (6420313678620788457) -->
-    <skip />
-    <!-- no translation found for keywords_all_apps (5377153522551809915) -->
-    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer, preferencias, predeterminadas"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplicaciones, descarga, aplicaciones, sistema"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2555,25 +2548,16 @@
     </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Hay algunas configuraciones predeterminadas establecidas."</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"No hay configuraciones predeterminadas establecidas."</string>
-    <!-- no translation found for filter_all_apps (1988403195820688644) -->
-    <skip />
-    <!-- no translation found for filter_enabled_apps (3318021007093070639) -->
-    <skip />
-    <!-- no translation found for filter_personal_apps (3277727374174355971) -->
-    <skip />
-    <!-- no translation found for filter_work_apps (24519936790795574) -->
-    <skip />
-    <!-- no translation found for filter_notif_blocked_apps (3446926933792244485) -->
-    <skip />
-    <!-- no translation found for filter_notif_priority_apps (5965001885749195239) -->
-    <skip />
-    <!-- no translation found for filter_notif_sensitive_apps (412490487743581673) -->
-    <skip />
-    <!-- no translation found for reset_app_preferences_description (7718912868244058770) -->
-    <skip />
-    <!-- no translation found for all_apps_summary (3754827293203127282) -->
-    <skip />
-    <!-- no translation found for advanced_apps (4812975097124803873) -->
-    <skip />
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Habilitadas"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritarias"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciales"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer preferencias a sus valores predeterminados en todas las aplicaciones"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Hay <xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas las aplicaciones del sistema y las descargadas."</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 64046c3..4252f7d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cuando aparezca este icono, puedes usar tu huella digital para identificarte o autorizar una compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Añadir"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Siguiente"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Se ha detectado una huella digital parcial. Vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"El sensor de huellas digitales está sucio. Límpialo y vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Has movido el dedo muy rápido. Vuelve a intentarlo."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Has movido el dedo muy despacio. Vuelve a intentarlo."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"No se puede procesar. Vuelve a intentarlo."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware no disponible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"No se puede almacenar la huella digital. Elimina una ya creada."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Se ha alcanzado el tiempo de espera de la huella digital. Vuelve a intentarlo."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cifrado"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Cifrar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Cifrar teléfono"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferir conexión Wi-Fi (solo se usa la red móvil si la conexión Wi-Fi no está disponible)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferir conexión móvil (solo se usa la conexión Wi-Fi si la red móvil no está disponible)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo conexión Wi-Fi (no se usa la red móvil; no es posible hacer ni recibir llamadas sin Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transferencia de WFC en itinerancia"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permitir que las llamadas de voz Wi-Fi se transfieran a una red móvil en itinerancia"</string>
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -1450,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce el PIN del dispositivo para habilitar el desbloqueo de OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"¿Permitir desbloqueo de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVERTENCIA: Las funciones de protección no funcionarán en este dispositivo mientras esta opción esté activada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Elegir tamaños Logger/búfer registro"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Habilitar registro Wi-Fi detallado"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transferencia total de Wi‑Fi a móvil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir siempre búsquedas de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP heredado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar nivel registro sesión Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si está habilitada, la conexión Wi‑Fi será más agresiva al transferir conexión de datos al móvil (si la señal Wi‑Fi no es estable)"</string>
@@ -1465,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Habilitar inspección de atributos de vista"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza el cliente DHCP de Lollipop en lugar del nuevo cliente DHCP de Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"La depuración USB solo está indicada para actividades de desarrollo. Puedes utilizarla para intercambiar datos entre el ordenador y el dispositivo, para instalar aplicaciones en el dispositivo sin recibir notificaciones y para leer datos de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"¿Quieres revocar el acceso a la depuración USB de todos los ordenadores que habías autorizado anteriormente?"</string>
@@ -2365,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaje texto, mensajes texto, mensajes"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular, móvil, conexión inalámbrica, datos, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi llamada llamadas itinerancia transferencia"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi llamada llamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar, patalla, pantalla táctil, batería"</string>
@@ -2563,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas aplicaciones descargadas y del sistema"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0720955..527abcc 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alati kui seda ikooni näete, saate tuvastamiseks või ostu volitamiseks kasutada oma sõrmejälge."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lisa"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Järgmine"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Tuvastati osaline sõrmejälg. Proovige uuesti."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Sõrmejäljeandur on must. Puhastage see ja proovige uuesti."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Sõrm liikus liiga kiiresti. Proovige uuesti."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Sõrm liikus liiga aeglaselt. Proovige uuesti."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Töötlemine ei õnnestu. Proovige uuesti."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Riistvara pole saadaval."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Sõrmejälge ei saa salvestada. Eemaldage olemasolev sõrmejälg."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Sõrmejälje riistvara taimeri ajalõpp. Proovige uuesti."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tahvelarvuti krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoni krüpteerimine"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"WiFi eelistusega (kasutab mobiilivõrku vaid siis, kui WiFi pole saadaval)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobiilside eelistusega (kasutab WiFi-võrku vaid siis, kui mobiilivõrk pole saadaval)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Ainult WiFi (Mobiilivõrku ei kasutata. Kui WiFi-t pole, ei saa helistada ega kõnesid vastu võtta)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC üleandmine rändluse ajal"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Lubab rändluse ajal WiFi-häälkõnede üleandmise mobiilivõrku"</string>
     <string name="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Asukoha määramine GPS-i, WiFi- ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Asukoha määramine WiFi- ja mobiilsidevõrgu abil"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Kasutage asukoha määramiseks GPS-i"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skannimine"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skannimine"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM-i avamise lubamiseks sisestage seadme PIN-kood"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Kas lubada OEM-i avamine?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"HOIATUS! Kui see seade on sisse lülitatud, ei toimi seadme turvafunktsioonid."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logija puhvri suurused"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vali logija suur. logipuhvri kohta"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Luba kuva atribuudi hindamine"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Võrgustik"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Luba WiFi paljusõnaline logimine"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressiivne WiFi-lt mobiilile üleminek"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Luba alati WiFi-rändluse skannimine"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"DHCP pärandkliendi kasutamine"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Juhtmeta ekraaniühenduse sertifitseerimisvalikute kuvamine"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Suurenda WiFi logimistaset, kuva WiFi valijas SSID RSSI järgi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kui see on lubatud, siis püüab WiFi nõrga WiFi-signaali korral agressiivsemalt anda andmeside ühenduse üle mobiilsele andmesidele"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Luba kuva atribuudi hindamine"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Kasutage uue Androidi DHCP-kliendi asemel Lollipopi DHCP-klienti."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-silumine on mõeldud ainult arendamiseks. Kasutage seda andmete kopeerimiseks oma arvuti ja seadme vahel, seadmesse rakenduste installimiseks ilma teatisteta ning logiandmete lugemiseks."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Kas tühistada juurdepääs USB silumisele kõikides arvutites, mille olete varem volitanud?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wifi-võrgu ühendus"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstisõnum SMS-i saatmine sõnumid sõnumside"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiil mobiilioperaator traadita andmed 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wifi kõne helistamine rändlus üleandmine"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi kõne helistamine"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käivitaja"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekraan puutetundlik ekraan"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ekraani hämardamine puuteekraan aku"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Installiti <xliff:g id="COUNT">%d</xliff:g> rakendust, sh süsteemi- ja allalaaditud rakendused"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index f6161c2..105d7f0 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ikono hau ikusten duzunean, hatz-marka digitala erabil dezakezu zeure burua identifikatzeko edo erosketak baimentzeko."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Gehitu"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Hurrengoa"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Hatz-marka digitala ez da osorik hauteman da. Saiatu berriro."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Hatz-marka digitalen sentsorea zikina dago. Garbi ezazu, eta saiatu berriro."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Hatza bizkorregi mugitu duzu. Saiatu berriro."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Hatza mantsoegi mugitu duzu. Saiatu berriro."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Ezin da prozesatu. Saiatu berriro."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Ez dago erabilgarri hardwarea."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Ezin da gorde hatz-marka digitala. Kendu lehendik gordeta duzunetako bat."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Hatz-marka digitalak prozesatzeko denbora-muga gainditu da. Saiatu berriro."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkriptatzea"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkriptatu tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkriptatu telefonoa"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi sarea hobetsia (Wi-Fi sarea erabilgarri ez badago soilik erabiltzen du sare mugikorra)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Sare mugikorra hobetsia (sare mugikorra erabilgarri ez badago soilik erabiltzen du Wi-Fi sarea)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi sarea soilik (Ez du sare mugikorra erabiltzen inoiz. Ezin da deirik egin edo jaso Wi-Fi sarera konektatuta egon ezean.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Wi-Fi deiak ibiltaritzan"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Onartu Wi-Fi bidezko deiak sare mugikorreko dei bihurtzea ibiltaritzan bazaude"</string>
     <string name="home_settings" msgid="212375129455718176">"Hasiera"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Erabili GPS antena, Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Erabili Wi‑Fi sarea eta sare mugikorrak kokapena zehazteko"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Bilatzea"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilatzea"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi eta sare mugikor bidezko kokapena"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Utzi aplikazioei zure kokapena bizkorrago zehazteko Google-ren kokapen-zerbitzua erabiltzen. Kokapen-datu anonimoak bildu eta Google-ra bidaliko dira."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Kokapena Wi-Fi bidez zehaztuta"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM desblokeoa gaitzeko, idatzi gailuaren PIN kodea"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM desblokeoa onartu nahi duzu?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ABISUA: ezarpen hau aktibatuta dagoen bitartean, gailuaren babes-eginbideek ez dute gailu honetan funtzionatuko."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Erregistroen buffer-tamainak"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Hautatu erregistroen buffer-tamainak"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Onartu kokapen faltsuak"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Onartu kokapen faltsuak"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Gaitu ikuspegiaren atributuak ikuskatzeko aukera"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sareak"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Hari gabeko bistaratze-egiaztatzea"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Gaitu Wi-Fi sareetan saioa hasteko modu xehatua"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Behartu Wi-Fi konexiotik datuenera aldatzera"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Onartu beti ibiltaritzan Wi-Fi sareak bilatzea"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Erabili aurreko bertsioko DHCP bezeroa"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Erakutsi hari gabeko bistaratze-egiaztapenaren aukerak"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Erakutsi datu gehiago Wi-Fi sareetan saioa hasterakoan. Erakutsi sarearen identifikatzailea eta seinalearen indarra Wi‑Fi sareen hautagailuan."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Aukera hori gaituz gero, gailua errazago aldatuko da datu mugikorren konexiora Wi-Fi seinalea ahultzen dela nabaritutakoan"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Onartu kokapen faltsuak"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Onartu kokapen faltsuak"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Gaitu ikuspegiaren atributuak ikuskatzeko aukera"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Erabili Lollipop bertsioko DHCP bezeroa eta ez Android DHCP bezero berria."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB arazketa onartu?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB arazketa garapen-xedeetarako soilik dago diseinatuta. Erabil ezazu ordenagailuaren eta gailuaren artean datuak kopiatzeko, aplikazioak gailuan jakinarazi gabe instalatzeko eta erregistro-datuak irakurtzeko."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Aurretik baimendutako ordenagailu guztiei USB arazketarako sarbidea baliogabetu nahi diezu?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sareko konexioa"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"testu-mezua, testu-mezuak, mezuak"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mugikorra, operadorea, eramailea, hari gabeko datuak, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi dei deitu ibiltaritza bihurtu"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi deia deitzea"</string>
     <string name="keywords_home" msgid="3626170808219458848">"abiarazlea"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ukipen pantaila"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ilundu pantaila, ukipen-pantaila, bateria"</string>
@@ -2555,14 +2551,15 @@
     <string name="launch_defaults_some" msgid="313159469856372621">"Hobespen lehenetsi batzuk ezarrita daude"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Ez dago hobespen lehenetsirik ezarrita"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Aplikazio guztiak"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"Gaituta"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Gaitutakoak"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
-    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeatuta"</string>
-    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Lehentasuna"</string>
-    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Isilpekotasuna"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokeatutakoak"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Lehentasunezkoak"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Isilpekoak"</string>
     <string name="reset_app_preferences_description" msgid="7718912868244058770">"Berrezarri aplikazio guztien hobespenak balio lehenetsietara"</string>
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikazio instalatu dira, sistemakoak eta deskargatutakoak barne"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9e6ca43..2ab5542 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"هر زمان این نماد را ببینید، می‌توانید از اثر انگشتتان برای شناسایی یا تأیید خرید استفاده کنید."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"افزودن"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"بعدی"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"بخشی از اثر انگشت شناسایی شد. لطفاً دوباره امتحان کنید."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"حسگر اثر انگشت کثیف است. لطفاً آن را تمیز کنید و دوباره امتحان نمایید."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"انگشت خیلی سریع حرکت کرد. لطفاً دوباره امتحان کنید."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"انگشت خیلی آهسته حرکت کرد. لطفاً دوباره امتحان کنید."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"پردازش ممکن نیست. دوباره امتحان کنید."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"سخت‌افزار در دسترس نیست."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ذخیره اثر انگشت ممکن نیست. لطفاً یک اثر انگشت موجود را حذف کنید."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"مهلت زمانی ثبت اثر انگشت به پایان رسید. دوباره امتحان کنید."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"رمزگذاری"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi ترجیحی (تنها در صورت در دسترس نبودن Wi-Fi، از شبکه همراه استفاده می‌کند)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏شبکه همراه ترجیحی (تنها در صورت در دسترس نبودن شبکه همراه، از Wi-Fi استفاده می‌کند)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏فقط Wi-Fi (هرگز از شبکه همراه استفاده نمی‌کند. در صورت در دسترس نبودن Wi-Fi، برقراری یا دریافت تماس امکان‌پذیر نیست)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"‏انتقال WFC هنگام رومینگ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"‏هنگام رومینگ، به انتقال تماس صوتی Wi-Fi به شبکه همراه اجازه داده شود"</string>
     <string name="home_settings" msgid="212375129455718176">"صفحه اصلی"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحهٔ نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏استفاده از GPS،‏ Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏استفاده از Wi-Fi و شبکه‌های تلفن همراه برای تعیین مکان"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏استفاده از GPS برای تعیین موقعیت مکانی"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"اسکن کردن"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکن کردن"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"پین دستگاهتان را وارد کنید تا بازکردن قفل سازنده محصول اصلی را فعال کنید"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"اجازه می‌هید قفل سازنده تجهیزات اصلی باز شود؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"اخطار: وقتی این تنظیم روشن باشد، ویژگی‌های حفاظتی دستگاه در این دستگاه کار نمی‌کند."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"اندازه‌های حافظه موقت ثبت‌کننده"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"انتخاب اندازه‌ ثبت‌کننده در حافظه موقت ثبت"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"فعال کردن بازبینی ویژگی بازدید"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"شبکه"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏فعال کردن گزارش‌گیری طولانی Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏Wi‑Fi فعال برای واگذاری به شبکه سلولی"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏همواره به اسکن‌های رومینگ Wi‑Fi اجازه داده شود"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏استفاده از کلاینت DHCP قدیمی"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"نمایش گزینه‌ها برای گواهینامه نمایش بدون سیم"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏افزایش سطح گزارش‌گیری Wi‑Fi، نمایش به ازای SSID RSSI در انتخاب‌کننده Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏وقتی فعال است، در شرایط پایین بودن سیگنال، Wi‑Fi برای واگذار کردن اتصال داده به شبکه سلولی فعال‌تر خواهد بود."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"فعال کردن بازبینی ویژگی بازدید"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏به جای کلاینت Android DHCP جدید، از کلاینت Lollipop DHCP استفاده کنید."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏رفع عیب USB انجام شود؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏رفع عیب USB فقط برای اهداف برنامه‌نویسی در نظر گرفته شده است. از آن برای رونوشت‌برداری داده بین رایانه و دستگاه خود، نصب برنامه‌ها در دستگاه خود بدون اعلان و خواندن داده‌های گزارش استفاده کنید."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏دسترسی به اشکال‌زدایی USB از تمام رایانه‌هایی که قبلاً مجاز دانسته‌اید لغو شود؟"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi ‏اتصال شبکه wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"پیام نوشتاری ارسال پیامک پیام‌ها پیام‌رسانی"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏شبکه تلفن همراه تلفن همراه شرکت مخابراتی بی‌سیم داده 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"‏wifi، تماس از طریق wi-fi، تماس، رومینگ، انتقال"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi، تماس wifi، تماس"</string>
     <string name="keywords_home" msgid="3626170808219458848">"راه‌انداز"</string>
     <string name="keywords_display" msgid="6709007669501628320">"صفحه نمایش صفحه لمسی"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"باتری صفحه‌لمسی صفحه کم نور"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> برنامه نصب شده است، از جمله برنامه‌های سیستم و دانلود شده"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e27dcae..e2a4438 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kun tämä kuvake on näkyvissä, voit tunnistautua tai vahvistaa ostoksen sormenjälkesi avulla."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lisää"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seuraava"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Sormenjälki havaittiin vain osittain. Yritä uudelleen."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Sormenjälkitunnistin on likainen. Puhdista tunnistin ja yritä uudelleen."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Liikutit sormea liian nopeasti. Yritä uudelleen."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Liikutit sormea liian hitaasti. Yritä uudelleen."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Käsittely ei onnistu. Yritä uudelleen."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Laitteisto ei ole käytettävissä."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Sormenjälkeä ei voida tallentaa. Poista aiemmin lisätty sormenjälki."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Sormenjälkitunnistimen toiminta aikakatkaistiin. Yritä uudelleen."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tabletti"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi ensisijainen (käyttää matkapuhelinverkkoa vain jos Wi-Fi-verkko ei ole käytettävissä)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Matkapuhelinverkko ensisijainen (käyttää Wi-Fi-verkkoa vain jos matkapuhelinverkko ei ole käytettävissä)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Vain Wi-Fi (Ei koskaan käytä matkapuhelinverkkoa. Ei voi soittaa tai vastaanottaa puheluita, jos Wi-Fi ei ole käytettävissä.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-siirto roaming-tilassa"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Salli Wi-Fi-äänipuheluiden siirtyä matkapuhelinverkkoon, kun roaming on käytössä."</string>
     <string name="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Paikanna GPS:n ja Wi-Fi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Paikanna Wi-Fi- ja mobiiliverkkojen avulla"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Paikanna sijaintisi GPS:n avulla"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analysoidaan"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analysoidaan"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi- 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 Wi-Fi-yhteyden perusteella"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Anna laitteen PIN-koodi OEM-lukituksen avauksen käyttöön ottamiseksi"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Sallitaanko OEM:n lukituksen avaus?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VAROITUS: laitteen suojaustoiminnot eivät toimi tämän asetuksen ollessa käytössä."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Lokipuskurien koot"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Valitse puskurikohtaiset lokikoot"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ota attribuuttinäkymän tarkistus käyttöön"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Yhteysominaisuudet"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Langattoman näytön sertifiointi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Käytä Wi-Fin laajennettua lokikirjausta"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiivinen handover: Wi-Fi-matkapuh."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Salli Wi-Fi-verkkovierailuskannaus aina"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Käytä vanhaa DHCP-asiakassovellusta"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Näytä langattoman näytön sertifiointiin liittyvät asetukset"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Lisää Wi‑Fin lokikirjaustasoa, näytä SSID RSSI -kohtaisesti Wi‑Fi-valitsimessa."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kun asetus on käytössä, Wi-Fi siirtää datayhteyden aggressiivisemmin matkapuhelinverkolle, jos Wi-Fi-signaali on heikko."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ota attribuuttinäkymän tarkistus käyttöön"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Käytä Lollipopin DHCP-asiakassovellusta Androidin uuden DHCP-asiakassovelluksen sijasta."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-vianetsintä on tarkoitettu vain kehittäjien käyttöön. Sen avulla voidaan kopioida tietoja tietokoneesi ja laitteesi välillä, asentaa laitteeseesi sovelluksia ilmoittamatta siitä sinulle ja lukea lokitietoja."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Haluatko peruuttaa USB-vianetsinnän käyttöoikeuden kaikilta tietokoneilta, joille olet antanut luvan aiemmin?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"Wi-Fi wi-fi verkko yhteys"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstiviesti tekstiviestien lähetys viestit viestien lähetys"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"matkapuhelin kännykkä operaattori langaton tiedonsiirto 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi puhelu soittaa roaming siirto"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi puhelu soittaa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"käynnistysohjelma"</string>
     <string name="keywords_display" msgid="6709007669501628320">"näyttö kosketusnäyttö"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"näytön himmennys kosketusnäyttö akku"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> sovellusta asennettu, mukaan lukien järjestelmäsovelluksia ja ladattuja sovelluksia."</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2d8a3e9..568fcce 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ajouter"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Empreinte digitale partielle détectée. Veuillez essayer de nouveau."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Le capteur d\'empreintes digitales est sale. Veuillez le nettoyer et essayer de nouveau."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Le doigt a bougé trop vite. Veuillez essayer de nouveau."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Le doigt a bougé trop lentement. Veuillez essayer de nouveau."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Traitement impossible. Essayer de nouveau."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Matériel non disponible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"L\'empreinte digitale ne peut pas être enregistrée. Veuillez supprimer une empreinte existante."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Le temps attribué pour lire l\'empreinte est écoulé. Veuillez essayer de nouveau."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter le téléphone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Utiliser le réseau Wi-Fi de préférence (cellulaire seulement si réseau Wi-Fi non disponible)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Utiliser le réseau cellulaire de préférence (Wi-Fi seulement si réseau cellulaire non disponible)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi seulement (jamais util. rés. cell. : impossible de faire des appels si Wi-Fi non disponible)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transfert WFC en itinérance"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Autoriser transfert appels vocaux par Wi-Fi sur réseau cellulaire en itinérance"</string>
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analyse en cours…"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analyse en cours…"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Local. par Wi-Fi et rés. cell."</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Entrez votre NIP d\'appareil pour activer le déverrouillage OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permettre le déverrouillage par le fabricant?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctions de protection de l\'appareil ne fonctionneront pas sur cet appareil lorsque ce paramètre est activé."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons d\'enregistreur"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles enreg. par tampon journal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Réseautage"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. données Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données cellulaires"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Toujours autoriser la détection de réseaux Wi-Fi en itinérance"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utiliser l\'ancien client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options pour la certification d\'affichage sans fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Détailler davantage les données Wi-Fi, afficher par SSID RSSI dans sélect. Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si cette option est activée, le passage du Wi-Fi aux données cellulaires est forcé lorsque le signal Wi-Fi est faible"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Voulez-vous vraiment désactiver l\'accès au débogage USB de tous les ordinateurs précédemment autorisés?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connexion réseau wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"message texte envoyer des messages messages messagerie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire fournisseur de services données sans fil 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi appel appeler itinérance transfert"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi appel appeler"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile pile"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris des applications système et des applications téléchargées"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c153fb9..05d631a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Chaque fois que cette icône apparaît, vous pouvez utiliser votre empreinte pour vous identifier ou autoriser un achat."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ajouter"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Empreinte digitale partiellement détectée. Veuillez réessayer."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Le capteur d\'empreintes digitales est sale. Veuillez le nettoyer, puis réessayer."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Vous avez retiré votre doigt trop rapidement. Veuillez réessayer."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Vous avez déplacé votre doigt trop lentement. Veuillez réessayer."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Impossible de reconnaître l\'empreinte digitale. Veuillez réessayer."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Matériel non disponible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Impossible d\'enregistrer l\'empreinte digitale. Veuillez supprimer une empreinte existante."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Délai de détection de l\'empreinte digitale expiré. Veuillez réessayer."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi préféré (N\'utilise le réseau mobile que si le Wi-Fi n\'est pas disponible.)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile préféré (N\'utilise le Wi-Fi que si le réseau mobile n\'est pas disponible.)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi uniquement (Réseau mobile jamais utilisé. Impossible passer/recevoir appels si Wi-Fi non dispo.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Appels Wi-Fi en itinérance"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Autoriser le transfert des appels vocaux Wi-Fi vers réseau mobile en itinérance"</string>
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliser le GPS, le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliser le Wi‑Fi et les réseaux mobiles pour déterminer la position"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Recherche"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localisation via Wi-Fi et réseau mob."</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Saisir le code d\'accès de l\'appareil pour activer le déverrouillage OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Autoriser le déverrouillage OEM ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISSEMENT : Les fonctionnalités de protection de l\'appareil sont désactivées tant que ce paramètre est activé."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles Logger par tampon journal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mise en réseau"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Autoriser enreg. infos Wi-Fi détaillées"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Passage forcé du Wi-Fi aux données mobiles"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Toujours autoriser la détection de réseaux Wi-Fi en itinérance"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utiliser l\'ancien client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options de la certification de l\'affichage sans fil"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Détailler plus infos Wi-Fi, afficher par RSSI de SSID dans outil sélection Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Si cette option est activée, le passage du Wi-Fi aux données mobiles est forcé lorsque le signal Wi-Fi est faible."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activer l\'inspection d\'attribut d\'affichage"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliser le client DHCP de Lollipop au lieu du nouveau client DHCP Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Le débogage USB est conçu uniquement pour le développement. Utilisez-le pour copier des données entre votre ordinateur et votre appareil, installer des applications sur votre appareil sans notification et lire les données de journal."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Voulez-vous vraiment désactiver l\'accès au débogage USB de tous les ordinateurs précédemment autorisés ?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi réseau connexion"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS SMS/MMS messages messagerie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulaire opérateur mobile données sans fil 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi appel appeler itinérance transfert"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi appel appels"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lanceur d\'applications"</string>
     <string name="keywords_display" msgid="6709007669501628320">"écran écran tactile"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"assombrir l\'écran écran tactile batterie"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris des applications système et des applications téléchargées"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index b843e55..7a4732e 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -348,7 +348,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> identificación dixital inscrita</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Config. identificación"</string>
-    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para usar a túa identificación dixital para desbloquear a túa pantalla ou confirmar compras, teremos que: \n\n✓ Configurar o método de bloqueo da pantalla alternativa \n\n✓ Engadir a túa identificación dixital"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Para usar a túa impresión dixital para desbloquear a pantalla ou confirmar compras, teremos que: \n\n✓ Configurar o método de bloqueo da pantalla alternativa \n\n✓ Engadir a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Buscar o sensor"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localiza o sensor de identificacións dixitais na parte posterior do teléfono."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Nome"</string>
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Cando vexas esta icona, podes usar a túa identificación dixital para a identificación ou para autorizar unha compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engadir"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Detectouse unha identificación dixital parcial. Téntao de novo."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"O lector de identificación dixital está sucio. Límpao e téntao de novo."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"O dedo moveuse demasiado rápido. Téntao de novo."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"O dedo moveuse demasiado lento. Téntao de novo."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Non se pode procesar. Téntao de novo."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware non dispoñible."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Non se pode almacenar a identificación dixital. Elimina unha identificación dixital existente."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Esgotouse o tempo de espera da identificación dixital. Téntao de novo."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wifi preferida (usa a rede de móbil só se a wifi non está dispoñible)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Móbil preferido (usa a wifi só se a rede móbil non está dispoñible)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Só wifi (non usa rede móbil. Non se poden realizar/recibir chamadas se non hai unha wifi dispoñible)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Entrega cham. wifi itinerancia"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permitir a entrega de chamadas de voz por wifi á rede móbil en itinerancia"</string>
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utiliza GPS, wifi e redes móbiles para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utiliza wifi e redes móbiles para determinar a localización"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Analizando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localización por wifi e rede móbil"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localización determinada por wifi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduce o PIN do dispositivo para activar o desbloqueo do OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Queres permitir o desbloqueo do OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: As funcións de protección do dispositivo non funcionarán neste dispositivo se está activada esta configuración."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de rexistrador"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleccionar tamaños por búfer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir localizacións falsas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permite localizacións falsas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activar a inspección de atributos de visualización"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificado de visualización sen fíos"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Activar rexistro detallado da wifi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Entrega agresiva de wifi a móbil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir sempre buscas de itinerancia da wifi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP herdado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opcións para o certificado de visualización sen fíos"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nivel de rexistro da wifi, mostrar por SSID RSSI no selector de wifi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Cando está activada esta función, a wifi será máis agresiva ao entregar a conexión de datos ao móbil, cando o sinal wifi é feble"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir localizacións falsas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permite localizacións falsas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activar a inspección de atributos de visualización"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utiliza o cliente DHCP de Lollipop en lugar do novo cliente DHCP de Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Queres permitir a depuración USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuración de erros USB está deseñada unicamente para fins de programación. Utilízaa para copiar datos entre o ordenador e o dispositivo, instalar aplicacións no dispositivo sen enviar notificacións e ler os datos do rexistro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Queres revogar o acceso á depuración USB desde todos os ordenadores que autorizaches previamente?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensaxe de texto mensaxes de texto mensaxes mensaxería"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"móbil operador sen fíos datos 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi chamada chamando itinerancia entrega"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi chamada wifi chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"pantalla pantalla táctil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"atenuar pantalla pantalla táctil batería"</string>
@@ -2561,8 +2557,9 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Bloqueadas"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Con prioridade"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Confidenciais"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablece nos valores predeterminados as preferencias en todas as aplicacións"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer valores predeterminados das preferencias en todas as aplicacións"</string>
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicacións instaladas, incluídas as aplicacións descargadas e as do sistema"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6fa5406..98e2383 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"आंशिक अंगुली की छाप की पहचान की गई. कृपया पुनः प्रयास करें."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"अंगुली की छाप संवेदक गंदा है. कृपया साफ़ करें और पुनः प्रयास करें."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"अंगुली को तेज़ी से चलाया गया. कृपया पुनः प्रयास करें."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"अंगुली को धीरे चलाया गया. कृपया पुनः प्रयास करें."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"संसाधित करने में असमर्थ. पुनः प्रयास करें."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"हार्डवेयर उपलब्ध नहीं है."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"अंगुली की छाप को संग्रहीत नहीं किया जा सका. कृपया कोई मौजूदा छाप निकालें."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"अंगुली की छाप डालने का समय समाप्त हो गया. पुनः प्रयास करें."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"वाई-फ़ाई को प्राथमिकता (वाई-फ़ाई उपलब्‍ध ना होने पर ही सेल नेटवर्क का उपयोग करती है)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेल्‍युलर को प्राथमिकता (सेल नेटवर्क उपलब्‍ध ना होने पर ही वाई-फ़ाई का उपयोग करती है)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"केवल वाई-फ़ाई (कभी भी सेल नेटवर्क का उपयोग नहीं करती. वाई-फ़ाई ना हो तो कॉल करना या पाना संभव नहीं)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"रोमिंग में होने पर WFC हैंडऑफ़"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"रोमिंग में होने पर वाई-फ़ाई वॉइस कॉल को सेल नेटवर्क में हैंडऑफ़ की अनुमति दें"</string>
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"स्थान का पता लगाने के लिए, GPS, वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"स्थान का पता लगाने के लिए वाई-फ़ाई और सेल्युलर नेटवर्क का उपयोग करें"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्‍कैन करना"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्‍कैन करना"</string>
     <string name="location_network_based" msgid="6010456018401296590">"वाई-फ़ाई और सेल्युलर नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करने के लिए अपना डिवाइस पिन डालें"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करने की अनुमति दें?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: इस सेटिंग के चालू रहने पर डिवाइस सुरक्षा सुविधाएं इस डिवाइस पर काम नहीं करेंगी."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफ़र आकार"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफ़र लॉगर आकार चुनें"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता निरीक्षण सक्षम करें"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किंग"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाई-फ़ाई वर्बोस प्रवेश सक्षम करें"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"वाई-फ़ाई से सेल्यूलर पर बलपूर्वक हस्तांतरण"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"हमेशा वाई-फ़ाई रोम स्कैन करने दें"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"लीगेसी DHCP क्‍लाइंट"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस दिखाई देने के लिए प्रमाणन विकल्प दिखाएं"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाई-फ़ाई प्रवेश स्तर बढ़ाएं, वाई-फ़ाई पिकर में प्रति SSID RSSI दिखाएं"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"इसके सक्षम होने पर, जब वाई-फ़ाई संकेत कमज़ोर हों तो वाई-फ़ाई, डेटा कनेक्शन को सेल्यूलर पर अधिक बलपूर्वक भेजेगा"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्य विशेषता निरीक्षण सक्षम करें"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नए Android DHCP क्‍लाइंट के बजाय Lollipop के DHCP क्‍लाइंट का उपयोग करें."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग डीबग करने का उद्देश्‍य केवल विकास है. इसका उपयोग आपके कंप्‍यूटर और आपके डिवाइस के बीच डेटा की प्रतिलिपि बनाने, बिना नोटिफिकेशन के आपके डिवाइस पर ऐप्स इंस्‍टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"आपके द्वारा पूर्व में प्राधिकृत सभी कंप्यूटर से USB डीबगिंग की पहुंच निरस्त करें?"</string>
@@ -1959,10 +1955,10 @@
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा और सिंक्रनाइज़ेशन"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदलें"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"खाता सेटिंग"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"खाता निकालें"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"खाता हटाएं"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"कोई खाता जोड़ें"</string>
     <string name="finish_button_label" msgid="481587707657751116">"समाप्त"</string>
-    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता निकालें?"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता हटाएं?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टेबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="remove_account_failed" msgid="4010643669489606536">"यह बदलाव आपके व्यवस्थापक द्वारा अनुमत नहीं है"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi वाई-फ़ाई नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message texting messages messaging"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"वाईफ़ाई वाई-फ़ाई कॉल कॉलिंग रोमिंग हैंडऑफ़"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"वाईफ़ाई वाई-फ़ाई कॉल कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन टचस्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"हल्की रोशनी वाली टचस्‍क्रीन बैटरी"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"सिस्‍टम और डाउनलोड किए गए ऐप्‍स सहित, <xliff:g id="COUNT">%d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8b19e72..d81ed85 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -352,7 +352,7 @@
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Postavljanje otiska"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Da biste otključali zaslon ili potvrdili kupnju otiskom prsta, trebamo napraviti sljedeće: \n\n✓ postaviti pričuvni način zaključavanja zaslona \n\n✓ dodati vaš otisak prsta."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Traženje senzora"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor otiska prsta sa stražnje strane telefona."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Pronađite senzor otiska prsta na stražnjoj strani telefona."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Izbriši"</string>
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kada se prikaže ta ikona, možete se identificirati ili autorizirati kupnju otiskom prsta."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Otkriven je djelomični otisak prsta. Pokušajte ponovo."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Senzor otiska prsta nije čist. Očistite ga i pokušajte ponovo."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Prebrzo pomicanje prsta. Pokušajte ponovo."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Presporo pomicanje prsta. Pokušajte ponovo."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Nije obrađeno. Pokušajte ponovo."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardver nije dostupan."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Otisak prsta nije pohranjen. Uklonite postojeći otisak prsta."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Isteklo je vrijeme čekanja za otisak prsta. Pokušajte ponovo."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj tablet računalo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj telefon"</string>
@@ -759,8 +751,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Prednost ima Wi-Fi mreža (Upotrebljava se samo mobilna mreža ako Wi-Fi nije dostupan.)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Prednost ima mobilna mreža (Upotrebljava se samo Wi-Fi mreža ako mobilna mreža nije dostupna.)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Samo Wi-Fi (Nikad se ne upotrebljava mobilna mreža. Pozivi nisu mogući ako Wi-Fi nije dostupan.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Wi-Fi pozivi u roamingu"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Dopusti isporuku Wi-Fi glasovnih poziva mobilnoj mreži u roamingu"</string>
     <string name="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -1128,10 +1118,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Upotreba GPS-a, Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Upotreba Wi‑Fi i mobilnih mreža za utvrđivanje lokacije"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Upotreba GPS-a za utvrđivanje lokacije"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skeniranje"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skeniranje"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokacija Wi‑Fi i mobilne mreže"</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>
@@ -1461,10 +1449,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Unesite PIN uređaja da biste omogućili OEM otključavanje"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite li dopustiti OEM otključavanje?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORENJE: značajke za zaštitu uređaja neće funkcionirati na ovom uređaju dok je ta postavka uključena."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine međuspremnika zapisnika"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Odaberite veličinu međuspr. zapis."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Umrežavanje"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogući opširnu prijavu na Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aktivni prijelaz s Wi‑Fi na mob. mrežu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Uvijek dopusti slobodno traženje Wi-Fi mreže"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Upotrebljavaj stari DHCP klijent"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Prikaži opcije za certifikaciju bežičnog prikaza"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećana razina prijave na Wi‑Fi, prikaz po SSID RSSI-ju u Biraču Wi‑Fi-ja"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ako je omogućeno, Wi-Fi će aktivno prebacivati podatkovnu vezu mobilnoj mreži kada je Wi-Fi signal slab."</string>
@@ -1476,6 +1471,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Omogući pregled atributa prikaza"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Upotrebljavaj DHCP klijent s Lollipopa umjesto novog Android DHCP klijenta."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Rješavanje programske pogreške USB-a namijenjeno je samo u razvojne svrhe. Može se upotrijebiti za kopiranje podataka s računala na uređaj i obrnuto, instalaciju aplikacija na uređaju bez obavijesti i za čitanje dnevničkih zapisa."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Želite li opozvati pristup uklanjanju pogrešaka USB-a sa svih računala koja ste prethodno autorizirali?"</string>
@@ -1768,7 +1764,7 @@
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ta usluga glasovnog unosa moći će neprekidno nadzirati glasovne unose i kontrolirati aplikacije s omogućenom glasovnom interakcijom u vaše ime. Pruža je aplikacija <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Želite li omogućiti tu uslugu?"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Postavke za tekst u govor"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Izlaz pretvaranja teksta u govor"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Pretvaranje teksta u govor"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Uvijek koristi moje postavke"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Donje zadane postavke poništavaju postavke aplikacije"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Zadane postavke"</string>
@@ -2376,7 +2372,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi mreža veza"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekstne poruke slanje SMS-a poruke slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobitel mobilni operater bežično podaci 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi poziv pozivanje roaming isporuka poziva"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi Wi-Fi poziv pozivanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pokretač"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon dodirni zaslon"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatamnjenje zaslon dodirni zaslon baterija"</string>
@@ -2577,4 +2573,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Broj instaliranih aplikacija, uključujući aplikacije sustava i preuzete aplikacije: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7b4c266..23c07b6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ha ezt az ikont látja, akkor lehetősége van arra, hogy ujjlenyomatával azonosítsa magát, vagy engedélyezze a vásárlást."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Hozzáadás"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Következő"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"A rendszer az ujjlenyomatnak csak egy részletét érzékelte. Próbálkozzon újra."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Az ujjlenyomat-olvasó koszos. Tisztítsa meg, majd próbálkozzon újra."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Túl hamar vette el az ujját. Próbálkozzon újra."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Túl lassan vette el az ujját. Próbálkozzon újra."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"A feldolgozás sikertelen. Próbálkozzon újra."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"A hardver nem érhető el."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Az ujjlenyomat nem tárolható. Távolítson el egy meglévő ujjlenyomatot."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Az ujjlenyomat-beolvasási művelet időtúllépést követett el. Próbálkozzon újra."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon titkosítása"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi előnyben részesítve (csak akkor használ mobilhálózatot, ha a Wi-Fi nem érhető el)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilhálózat előnyben részesítve (csak akkor használ Wi-Fi-t, ha a mobilhálózat nem érhető el)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Csak Wi-Fi (Nem használ mobilhálózatot. Nem lehet hívásokat indítani vagy fogadni, ha nincs Wi-Fi.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-átadás adatbarangoláskor"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"A Wi-Fi-hanghívások átadásának engedélyezése mobilhálózatoknak adatbarangoláskor"</string>
     <string name="home_settings" msgid="212375129455718176">"Főoldal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi- és mobilhálózatok használata a tartózkodási hely megállapításához"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS használata a tartózkodási hely meghatározásához"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Beolvasás"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Beolvasás"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Hely Wi‑Fi és mobil 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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Adja meg az eszköz PIN kódját a kártyafüggetlenítéshez"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Engedélyezi az OEM-feloldást?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"FIGYELEM! Az eszközvédelmi funkciók addig nem fognak működni ezen az eszközön, amíg ez a beállítás be van kapcsolva."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger pufferméret"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Logger naplópufferméret választása"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Nézetattribútum vizsgálatának engedélyezése"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Hálózatok"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vezeték nélküli kijelző tanúsítványa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Részletes Wi-Fi-naplózás engedélyezése"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresszív Wi‑Fi–mobilhálózat átadás"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi-roaming ellenőrzésének engedélyezése mindig"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Korábbi DHCP-kliens használata"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Beállítások megjelenítése a vezeték nélküli kijelző tanúsítványával kapcsolatban"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi-naplózási szint növelése, RSSI/SSID megjelenítése a Wi‑Fi-választóban"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ha engedélyezi, a Wi-Fi agresszívebben fogja átadni az adatkapcsolatot a mobilhálózatnak gyenge Wi-Fi-jel esetén"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Nézetattribútum vizsgálatának engedélyezése"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"A Lollipop DHCP-kliensének használata az új androidos DHCP-kliens helyett."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Az USB hibakeresés fejlesztési célokat szolgál. Használhatja adatok másolására a számítógép és a készülék között, alkalmazások a készülékre való értesítés nélküli telepítésére és naplózási adatok olvasására."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Visszavonja a hozzáférést az USB-s hibakereséshez az összes számítógépről, ahol korábban engedélyezte azt?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi hálózati kapcsolat"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"szöveges üzenet szöveges üzenet küldése üzenetek üzenetváltás"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobil cella szolgáltató vezeték nélküli adat 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi hív hívás adatbarangolás átadás"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hív hívás"</string>
     <string name="keywords_home" msgid="3626170808219458848">"indító"</string>
     <string name="keywords_display" msgid="6709007669501628320">"képernyő érintőképernyő"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"képernyő sötétítése érintőképernyő akkumulátor"</string>
@@ -2460,7 +2456,7 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Kezelje prioritást élvezőként"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Az alkalmazásból származó értesítések legyenek hallhatók, amikor a „Ne zavarjanak” mód „Csak prioritást élvezők” értékre van állítva"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Betekintés engedélyezése"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Az alkalmazás kiemelhet bizonyos értesítéseket úgy, hogy kissé becsúsztatja azokat az éppen aktuális képernyő szélén"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Az alkalmazás kiemelhet bizonyos értesítéseket úgy, hogy rövid időre becsúsztatja azokat az éppen aktuális képernyő szélén"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Bizalmas tartalom elrejtése"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"A bizalmas tartalom elrejtése az alkalmazás értesítéseiből, ha az eszköz zárolva van"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Letiltva"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> alkalmazás telepítve, beleértve a rendszer- és a letöltött alkalmazásokat"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index f981d9b..a0736c3 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -339,10 +339,10 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Գաղտնաբառեր"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Մատնահետք"</string>
-    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Մատնահետքի կառավարում"</string>
-    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Օգտագործել մատնահետքը"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Մատնահետքերի կառավար"</string>
+    <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Օգտագործման նպատակը"</string>
     <string name="fingerprint_add_title" msgid="3453670509485083962">"Ավելացնել"</string>
-    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"էկրանի փական"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"էկրանի կողպում"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="4776063289827470602">
       <item quantity="one">Գրանցվել է <xliff:g id="COUNT_1">%1$d</xliff:g> մատնահետք</item>
       <item quantity="other">Գրանցվել է <xliff:g id="COUNT_1">%1$d</xliff:g> մատնահետք</item>
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Եթե տեսնում եք այս պատկերակը, դա նշանակում է, որ կարող եք օգտագործել ձեր մատնահետքը՝ նույնականացում կատարելու կամ գնումը թույլատրելու համար:"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ավելացնել"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Մատնահետքը հայտնաբերվել է մասամբ: Փորձեք նորից:"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Մատնահետքերի սենսորն աղտոտված է: Մաքրեք այն և փորձեք նորից:"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Մատը շարժեցիք շատ արագ: Փորձեք նորից:"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Մատը շարժեցիք շատ դանդաղ: Փորձեք նորից:"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Հնարավոր չէ շարունակել: Փորձեք նորից:"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Սարքն անհասանելի է:"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Հնարավոր չէ պահել մատնահետքը: Հեռացրեք առկա մատնահետքը:"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Մատնահետքի գրանցման ժամանակը սպառվել է: Փորձեք նորից:"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Կոդավորում"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Կոդավորել գրասալիկը"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Կոդավորել հեռախոսը"</string>
@@ -627,7 +619,7 @@
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Ընդլայնված ընտրանքներ"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi-ով պաշտպանված կարգավորում"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-ը մեկնարկում է..."</string>
-    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Սեղմեք երթուղիչի «Wi‑Fi-ով պաշտպանված կարգավորում» կոճակը: Այն կարող է կոչվել «WPS» կամ նշված լինել այս նշանով՝"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="7464388959427032052">"Սեղմեք երթուղիչի «անվտանգ Wi‑Fi կարգավորում» կոճակը: Այն կարող է կոչվել «WPS» կամ նշված լինել այս նշանով՝"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Մուտքագրեք ձեր Wi‑Fi երթուղիչի pin-ի <xliff:g id="NUMBER">%1$s</xliff:g>-ը: Կարգավորումը ավարտելու համար կպահանջվի մի քանի րոպե:"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS-ը հաջողվեց: Միանում է ցանցին..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Միացված է <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ցանցին"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi, նախընտրելի (Օգտագործում է բջջային ցանցը միայն երբ հասանելի Wi-Fi ցանց չկա)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Բջջային, նախընտրելի (Օգտագործում է Wi-Fi-ը միայն երբ հասանելի բջջային ցանց չկա)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Միայն Wi-Fi (Բջջային ցանց չի օգտագործում: Հնարավոր չէ կատարել կամ ստանալ զանգեր, եթե Wi-Fi ցանց չկա)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC փոխանցում ռոումինգում"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Թույլ տալ Wi-Fi ձայնային զանգերի փոխանցումը բջջային ցանցին ռոումինգում"</string>
     <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ցուցադրիչ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Սկանավորում"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Սկանավորում"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi և բջջային ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի կողմից"</string>
@@ -1149,7 +1137,7 @@
     <string name="webview_license_title" msgid="2813507464175738967">"Համակարգի WebView-ի լիցենզիա"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Պաստառներ"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Արբանյակային պատկերների մատակարարներ՝\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց կոդի արտոնագրեր"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Բաց կոդով ծրագրաշարի արտոնագրեր"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Խնդիր կա լիցենզիաները բեռնելիս:"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Բեռնում...."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Անվտանգության տեղեկատվություն"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Մուտքագրեք ձեր սարքի PIN-ը՝ OEM ապակողպումն ակտիվացնելու համար:"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Թույլատրե՞լ OEM ապակողպումը:"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ԶԳՈՒՇԱՑՈՒՄ. Այս կարգավորումը միացրած ժամանակ սարքի պաշտպանության գործառույթները չեն աջակցվի այս սարքի վրա:"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Տեղեկամատյանի պահնակի չափերը"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ընտրեք տեղեկամատյանի չափը մեկ պահնակի համար"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Միացնել ցուցադրման հատկանիշների ստուգումը"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ցանց"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Միացնել Wi‑Fi մանրամասն գրանցամատյանները"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-ից կտրուկ անցում բջջային ինտերնետի"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Միշտ թույլատրել Wi‑Fi ռոումինգի որոնումը"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Օգտագործել DHCP ծրագրի ավելի հին տարբերակները"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ցույց տալ անլար էկրանի վկայագրման ընտրանքները"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Բարձրացնել մակարդակը, Wi‑Fi ընտրիչում ամեն մի SSID-ի համար ցույց տալ RSSI"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Եթե այս գործառույթը միացված է, Wi‑Fi-ի թույլ ազդանշանի դեպքում Wi‑Fi ինտերնետից անցումը բջջային ինտերնետին ավելի կտրուկ կլինի"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Միացնել ցուցադրման հատկանիշների ստուգումը"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Օգտագործել Lollipop-ի DHCP ծրագիրը՝ նոր Android DHCP ծրագրի փոխարեն:"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Թույլատրե՞լ USB-ի վրիպազերծումը:"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB վրիպազերծումը միայն ծրագրավորման նպատակների համար է: Օգտագործեք այն ձեր համակարգչից տվյալները ձեր սարք պատճենելու համար, առանց ծանուցման ձեր սարքի վրա ծրագրեր տեղադրելու և տվյալների մատյանը ընթերցելու համար:"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Փակե՞լ USB-ի վրիպազերծման մուտքը` անջատելով այն բոլոր համակարգիչներից, որտեղ նախկինում թույլատրել էիք:"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"տեքստային հաղորդագրություն տեքստային հաղորդագրություն գրել հաղորդակցում"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"բջջային օպերատոր անլար 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi զանգ զանգեր ռոումինգ փոխանցում"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi զանգ զանգեր"</string>
     <string name="keywords_home" msgid="3626170808219458848">"թողարկիչ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"հպէկրան"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"էկրանի խամրում հպէկրան մարտկոց"</string>
@@ -2458,11 +2454,11 @@
     <string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Երբեք ցույց չտալ ծանուցումներ այս ծրագրից"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Դիտարկել որպես առաջնահերթ"</string>
-    <string name="app_notification_priority_summary" msgid="242979561927455238">"Թույլատրել այս հավելվածի ծանուցումները, երբ «Չանհանգստացնել» գործառույթի համար սահմանված է «Միայն կարևոր ծանուցումների դեպքում» արժեքը"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Թույլ տալ, որ peeking"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Թույլ տալ այս հավելվածին ընդգծել որոշ ծանուցումները՝ դրանք ընթացիկ էկրանում մեկ ակնթարթ ցույց տալու միջոցով"</string>
-    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Թաքցնել զգայուն բովանդակությունը"</string>
-    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Երբ սարքը արգելափակված է, թաքցնել այս հավելվածի ծանուցումների բովանդակությունը, որը կարող է բացահայտել անձնական տեղեկությունները"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Թույլատրել այս հավելվածի ձայնային ծանուցումները, երբ «Չանհանգստացնել» գործառույթի համար սահմանված է «Միայն կարևոր ծանուցումների դեպքում» արժեքը"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Թույլատրել կարճ ծանուցումներ"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Թույլ տալ այս հավելվածին ընդգծել որոշ ծանուցումները՝ դրանք ընթացիկ էկրանին մեկ ակնթարթ ցույց տալու միջոցով"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Թաքցնել գաղտնի տվյալները"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Երբ սարքը կողպված է, այս հավելվածում թաքցնել գաղտնի տվյալներ պարունակող ծանուցումները"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Արգելափակված է"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Կարևորություն"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Զգայուն"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Տեղադրվել է <xliff:g id="COUNT">%d</xliff:g> հավելված (այդ թվում նաև համակարգային և ներբեռնած հավելվածներ)"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ce1d122..d9fafd7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Setiap kali melihat ikon ini, Anda dapat menggunakan sidik jari untuk identifikasi atau mengotorisasi pembelian."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tambahkan"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Berikutnya"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Sebagian sidik jari terdeteksi. Coba lagi."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Sensor sidik jari kotor. Bersihkan dan coba lagi."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Jari digerakkan terlalu cepat. Coba lagi."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Jari digerakkan terlalu lambat. Coba lagi."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Tidak dapat memproses. Coba lagi."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Perangkat keras tidak tersedia."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Sidik jari tidak dapat disimpan. Hapus sidik jari yang ada."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Waktu sidik jari habis. Coba lagi."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripsi tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripsi ponsel"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi dipilih (Menggunakan jaringan seluler hanya jika Wi-Fi tidak tersedia)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Seluler dipilih (Hanya menggunakan Wi-Fi jika jaringan seluler tidak tersedia)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Khusus Wi-Fi (Tidak pernah menggunakan jaringan seluler. Tidak dapat melakukan atau menerima panggilan telepon jika Wi-Fi tidak tersedia)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Handoff PWF saat roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Izinkan handoff panggilan suara Wi-Fi ke jaringan seluler saat roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi‑Fi, dan jaringan seluler untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi‑Fi dan jaringan seluler untuk menentukan lokasi"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Menggunakan GPS untuk menentukan lokasi"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Memindai"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Memindai"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi jaringan 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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN perangkat untuk mengaktifkan buka kunci OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Izinkan buka kunci OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"PERINGATAN: Fitur perlindungan perangkat tidak akan berfungsi di perangkat ini saat setelan diaktifkan."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Ukuran penyangga pencatat log"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ukuran Pencatat Log/penyangga log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktifkan inspeksi atribut tampilan"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Jaringan"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Pengalihan Wi-Fi Agresif ke Seluler"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Selalu izinkan Pemindaian Roaming Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gunakan klien DHCP lawas"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tampilkan opsi untuk sertifikasi layar nirkabel"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tingkatkan level pencatatan log Wi-Fi, tampilkan per SSID RSSI di Pemilih Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Jika diaktifkan, Wi-Fi akan menjadi lebih agresif dalam mengalihkan sambungan data ke Seluler saat sinyal Wi-Fi lemah"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktifkan inspeksi atribut tampilan"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan klien DHCP dari Lollipop alih-alih klien DHCP Android baru."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugging USB dimaksudkan untuk tujuan pengembangan saja. Gunakan untuk menyalin data antara komputer dan perangkat Anda, memasang apl pada perangkat tanpa pemberitahuan, dan membaca data log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Cabut akses ke debug USB dari semua komputer yang telah Anda otorisasi sebelumnya?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection sambungan jaringan"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teks pesan mengirim SMS pesan perpesanan"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"seluler sel operator nirkabel data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi panggil menelepon roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi telepon menelepon"</string>
     <string name="keywords_home" msgid="3626170808219458848">"peluncur"</string>
     <string name="keywords_display" msgid="6709007669501628320">"layar sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"layar redup layar sentuh baterai"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikasi dipasang, termasuk aplikasi sistem dan yang diunduh"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index bacdd2f..1995da4 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Alltaf þegar þú sérð þetta tákn geturðu notað fingrafarið þitt til að auðkenna þig eða til að heimila kaup."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Bæta við"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Áfram"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Hluti fingrafars greindist. Reyndu aftur."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingrafaraskynjarinn er óhreinn. Hreinsaðu hann og reyndu aftur."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Fingurinn hreyfðist of hratt. Reyndu aftur."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Fingurinn hreyfðist of hægt. Reyndu aftur."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Ekki var hægt að vinna úr þessu. Reyndu aftur."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Vélbúnaður er ekki tiltækur."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Ekki er hægt að vista fingrafarið. Fjarlægðu eitthvert af fingraförunum sem fyrir eru."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tímamörk runnu út fyrir fingrafar. Reyndu aftur."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Dulkóðun"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Dulkóða spjaldtölvu"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Dulkóða síma"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi í forgangi (notar aðeins farsímakerfi ef Wi-Fi er ekki í boði)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Farsímakerfi í forgangi (notar aðeins Wi-Fi ef farsímakerfi er ekki í boði)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi eingöngu (notar aldrei farsímakerfi. Ekki hægt að hringja eða svara ef Wi-Fi er ekki í boði)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Kerfaskipting í reiki"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Leyfa að Wi-Fi símtöl séu flutt yfir á farsímakerfi í reiki"</string>
     <string name="home_settings" msgid="212375129455718176">"Heim"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjár"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hljóð"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Nota GPS, Wi-Fi og farsímakerfi til að ákvarða staðsetningu"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Nota Wi-Fi og farsímkerfi til að ákvarða staðsetningu"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nota GPS til að ákvarða staðsetningu"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skönnun"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skönnun"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Staðsetning með Wi-Fi og farsímakerfi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Leyfir forritum að nota þjónustu Google fyrir hraðvirkari staðsetningarákvörðun. Nafnlausar upplýsingar verða sendar til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi ákvarðar staðsetningu"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Sláðu inn PIN-númer tækisins til að gera opnun framleiðanda virka"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leyfa opnun framleiðanda?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"VIÐVÖRUN: Öryggiseiginleikar til að vernda tækið virka ekki í þessu tæki þegar þessi stilling er virk."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Annálsritastærðir biðminna"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veldu annálsritastærðir á biðminni"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Leyfa gervistaðsetningar"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Leyfa gervistaðsetningar"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Virkja yfirlit skoðunar eiginda"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netkerfi"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vottun þráðlausra skjáa"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kveikja á ítarlegri skráningu Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ágeng yfirfærsla frá Wi-Fi til símkerfis"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Leyfa alltaf reikileit með Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Nota gamlan DHCP-biðlara"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Sýna valkosti fyrir vottun þráðlausra skjáa"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Auka skráningarstig Wi-Fi, sýna RSSI fyrir hvert SSID í Wi-Fi vali"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Þegar þetta er virkt mun Wi-Fi ganga harðar fram í að færa gagnatenginguna yfir til símkerfisins þegar Wi-Fi merkið er lélegt"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Leyfa gervistaðsetningar"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leyfa gervistaðsetningar"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Virkja yfirlit skoðunar eiginda"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Nota gamla DHCP-biðlarann úr Lollipop í staðinn fyrir nýja Android DHCP-biðlarann."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leyfa USB-villuleit?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-villuleit er aðeins ætluð til nota í þróunarskyni. Hana má nota til að afrita gögn á milli tölvu og tækis, setja forrit upp í tækinu án tilkynninga og lesa annálagögn."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Afturkalla aðgang að USB-villuleit í öllum tölvum sem þú hefur áður veitt heimild?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi nettenging"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"skilaboð sms textaskilaboð sms-skilaboð"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"farsími farsímakerfi símafyrirtæki þráðlaust gögn 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi hringja símtal reiki skipta"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hringja símtal"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ræsiforrit"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skjár snertiskjár"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"myrkva skjár snertiskjár rafhlaða"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> forrit uppsett, þar með talin kerfisforrit og sótt forrit"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 28938ad..3edcf01 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando viene visualizzata questa icona, puoi utilizzare la tua impronta digitale per l\'identificazione o per autorizzare un acquisto."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Aggiungi"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Rilevata impronta digitale parziale. Riprova."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Il sensore di impronte digitali è sporco. Puliscilo e riprova."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Movimento del dito troppo rapido. Riprova."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Movimento del dito troppo lento. Riprova."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Impossibile elaborare l\'impronta. Riprova."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware non disponibile."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Impossibile memorizzare l\'impronta digitale. Rimuovi un\'impronta esistente."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Timeout impronta digitale. Riprova."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia telefono"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Rete preferita: Wi-Fi (utilizza la rete cellulare solo se il Wi-Fi non è disponibile)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Rete preferita: cellulare (utilizza il Wi-Fi solo se la rete cellulare non è disponibile)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo Wi-Fi (non usa mai la rete cell. Non può eseguire/ricevere chiamate se il Wi-Fi non è dispon.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Passaggio WFC durante roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Consenti passaggio chiamate vocali Wi-Fi alla rete cellulare durante il roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Home page"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
@@ -1450,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Inserisci il PIN del dispositivo per attivare lo sblocco OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Consentire lo sblocco OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVVISO. Le funzioni di protezione del dispositivo non funzionano su questo dispositivo se questa impostazione è attiva."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensioni buffer Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleziona dim. Logger buffer log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Attiva controllo attributi visualizzazione"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Reti"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificazione display wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Attiva registrazione dettagliata Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi aggressivo per passaggio a cellulare"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Consenti sempre scansioni roaming Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilizza il client della versione precedente di DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opzioni per la certificazione display wireless"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumenta il livello di registrazione Wi-Fi, mostrando il SSID RSSI nel selettore Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Quando questa impostazione è attivata, il Wi-Fi sarà più aggressivo nel passare la connessione dati al cellulare, quando il segnale Wi-Fi è basso"</string>
@@ -1465,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Attiva controllo attributi visualizzazione"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizza il client DHCP di Lollipop anziché il nuovo client DHCP Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Il debug USB è solo a scopo di sviluppo. Utilizzalo per copiare dati tra il computer e il dispositivo, per installare applicazioni sul tuo dispositivo senza notifica e per leggere i dati dei log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revocare l\'accesso al debug USB da tutti i computer precedentemente autorizzati?"</string>
@@ -2365,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connessione rete Wi-Fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS invio di messaggi messaggi"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellulare cell operatore wireless dati 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi chiamata chiamare roaming passaggio"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi chiamata chiamare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Avvio applicazioni"</string>
     <string name="keywords_display" msgid="6709007669501628320">"display touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"attenuazione schermo touchscreen batteria"</string>
@@ -2563,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> app installate, incluse app di sistema e scaricate"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6792ebc..2278574 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"הוסף"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"זוהתה טביעת אצבע חלקית. נסה שוב."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"החיישן של טביעות האצבעות מלוכלך. נקה אותו ונסה שוב."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"האצבע זזה מהר מדי, נסה שוב."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"האצבע זזה לאט מדי, נסה שוב."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"אין אפשרות לעבד. נסה שוב."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"החומרה לא זמינה."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"לא ניתן לאחסן טביעת אצבע. הסר טביעת אצבע קיימת."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"חלף זמן קצוב לתפוגה של טביעת אצבע. נסה שוב."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנה"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן טאבלט"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi מועדף (שימוש ברשת סלולרית רק אם Wi-Fi אינו זמין)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏סלולרי מועדף (שימוש ב-Wi-Fi רק אם רשת סלולרית אינה זמינה)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏Wi-Fi בלבד (לעולם לא ייעשה שימוש ברשת סלולרית. לא ניתן לבצע או לקבל שיחות אם Wi-Fi אינו זמין)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"‏מסירת WFC בעת נדידה"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"‏אפשר מסירת שיחות קוליות ב-Wi-Fi לרשת סלולרית בעת נדידה"</string>
     <string name="home_settings" msgid="212375129455718176">"דף הבית"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏השתמש ב-GPS‏, Wi‑Fi ורשתות סלולריות לקביעת המיקום"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏השתמש ב-Wi-Fi ורשתות סלולריות לקביעת המיקום"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"סריקה"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"סריקה"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏מיקום עם Wi‑Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏הזן את מספר ה-PIN של המכשיר כדי להפעיל ביטול נעילה של OEM (יצרן ציוד מקורי)"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏האם לאפשר ביטול נעילה של OEM (יצרן ציוד מקורי)?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"אזהרה: תכונות הגנת מכשיר לא יפעלו במכשיר הזה כשההגדרה הזו פועלת."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"גדלי מאגר של יוצר יומן"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"בחר גדלים של יוצר יומן לכל מאגר יומן"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"תקשורת רשתות"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"‏אישור של תצוגת WiFi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏הפעל רישום מפורט של Wi‑Fi ביומן"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏העברה אגרסיבית מ-Wi‑Fi לרשת סלולרית"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏התר תמיד סריקות נדידה של Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏השתמש בלקוח DHCP מדור קודם"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"‏הצג אפשרויות עבור אישור של תצוגת WiFi"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏העלה את רמת הרישום של Wi‑Fi ביומן, הצג לכל SSID RSSI ב-Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏כשתכונה זו מופעלת, Wi-Fi יתנהג בצורה אגרסיבית יותר בעת העברת חיבור הנתונים לרשת הסלולרית כשאות ה-Wi-Fi חלש."</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"אפשר בדיקת תכונת תצוגה"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏השתמש בלקוח DHCP של Lollipop במקום לקוח DHCP החדש של Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניקוי באגים של USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏ניקוי באגים באמצעות USB מיועד למטרות פיתוח בלבד. השתמש בו להעתקת נתונים בין המחשב והמכשיר שלך, להתקנת אפליקציות במכשיר ללא התראה ולקריאת נתוני יומן."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏האם לבטל את הגישה לניקוי באגים ב-USB מכל המחשבים שהענקת להם בעבר הרשאה?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi חיבור רשת"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"הודעת טקסט שליחת הודעות טקסט הודעות העברת הודעות"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏סלולרי תא ספק אלחוטי נתונים 4 g ‏3g ‏2g ‏lte "</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"‏wifi שיחת wi-fi שיחה התקשרות נדידה מסירה"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi wi-fi שיחה התקשרות"</string>
     <string name="keywords_home" msgid="3626170808219458848">"מפעיל האפליקציות"</string>
     <string name="keywords_display" msgid="6709007669501628320">"מסך מגע"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"מסך עמום סוללה מסך מגע"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> אפליקציות מותקנות, כולל אפליקציות מערכת ואפליקציות שהורדת"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d37e1c1..26cee9a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"このアイコンが表示されているときは、本人確認や購入の承認に指紋を使用できます。"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"追加"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"次へ"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"指紋を一部しか検出できませんでした。もう一度お試しください。"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"指紋センサーに汚れがあります。汚れを落としてもう一度お試しください。"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"指の動きが速すぎました。もう一度お試しください。"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"指の動きが遅すぎました。もう一度お試しください。"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"処理できませんでした。もう一度お試しください。"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ハードウェアを利用できません。"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"指紋を保存できません。既存の指紋を削除してください。"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"指紋の読み取りがタイムアウトになりました。もう一度お試しください。"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"タブレットの暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"端末の暗号化"</string>
@@ -753,8 +745,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi優先(Wi-Fiが利用できない場合のみモバイルネットワークを使用します)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"モバイル優先(モバイルネットワークが利用できない場合のみWi-Fiを使用します)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fiのみ(モバイルネットワークを使用しないため、Wi-Fiが利用できない場合は発信も着信も行えません)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ローミング時のWFC切り替え"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ローミング時にWi-Fi音声通話をモバイルネットワークに切り替えることを許可"</string>
     <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
@@ -1121,10 +1111,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS、Wi‑Fi、モバイルネットワークで現在地を特定する"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fiとモバイルネットワークで現在地を特定する"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPSで現在地を特定する"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"スキャン"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"スキャン"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
@@ -1454,10 +1442,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEMロック解除を有効にするには端末のPINを入力してください"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEMロック解除の許可"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告: この設定をONにしている場合、この端末では端末保護機能を利用できません。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"各ログバッファのログサイズを選択"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"表示属性検査を有効にする"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ネットワーク"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi詳細ログの有効化"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fiローミングスキャンを常に許可する"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"従来のDHCPクライアントを使用する"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ワイヤレスディスプレイ認証のオプションを表示"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fiログレベルを上げて、Wi-Fi選択ツールでSSID RSSIごとに表示します"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"有効にすると、Wi-Fiの電波強度が弱い場合は強制的にモバイルデータ接続に切り替わるようになります"</string>
@@ -1469,6 +1464,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"表示属性検査を有効にする"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"新しいAndroid DHCPクライアントの代わりにLollipopのDHCPクライアントを使用します。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USBデバッグは開発専用に設計されています。パソコンと端末の間でデータをコピーする場合や、アプリを通知なしで端末にインストールする場合、ログデータを読み取る場合に使用できます。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"以前に許可したすべてのパソコンからのUSBデバッグへのアクセスを取り消しますか?"</string>
@@ -2373,7 +2369,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ネットワーク 接続"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"テキスト メッセージ テキスト送信 メッセージ SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"モバイル 携帯 携帯通信会社 無線 データ 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi 通話 発信 ローミング 切り替え"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi 通話 発信"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ランチャー"</string>
     <string name="keywords_display" msgid="6709007669501628320">"画面 タッチスクリーン"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"暗くする 画面 タッチスクリーン 電池"</string>
@@ -2571,4 +2567,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"インストール済みのアプリ: <xliff:g id="COUNT">%d</xliff:g>件(システムアプリやダウンロード済みアプリを含む)"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"プロフィールの選択"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index faca482..8df50fc 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"როდესად ამ ხატულას დაინახავთ, იდენტიფიცირების ან თქვენი შესყიდვის ავტორიზებისათვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"დამატება"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"შემდეგი"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"აღმოჩენილია თითის ნაწილობრივი ანაბეჭდი. გთხოვთ სცადეთ განმეორებით."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"თითის ანაბეჭდის სენსორი დაბინძურებულია. გთხოვთ გაასუფთავეთ და სცადეთ განმეორებით."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"თითი ზედმეტად სრაფად იქნა აღებული. გთხოვთ სცადეთ განმეორებით."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"თითი ზედმეტად ნელა იქნა აღებული. გთხოვთ სცადეთ განმეორებით."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ვერ ხერხდება დამუშავება. სცადეთ განმეორებით."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"აპარატი არ არის ხელმისაწვდომი."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ვერ ხერხდება თითის ანაბეჭდის შენახვა. გთხოვთ ამოშალეთ არსებული თითის ანაბეჭდი."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"თითის ანაბეჭდის დრო ამოიწურა. სცადეთ განმეორებით."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"დაშიფვრა"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ტაბლეტის დაშიფრვა"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ტელეფონის დაშიფვრა"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"სასურველია Wi-Fi (იყენებს ფიჭურ ქსელს მხოლოდ, როცა Wi-Fi მიუწვდომელია)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"სასურველია ფიჭური ინტერნეტი (იყენებს Wi-Fi-ს მხოლოდ, როცა ფიჭური ქსელი მიუწვდომელია)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"მხოლოდ Wi-Fi (არ იყენებს ფიჭურ ქსელს. დარეკვა და ზარების მიღება შეუძლებელია, როცა Wi-Fi მიუწვდომელია)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"როუმინგის დროს, WFC გადაცემა"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"როუმინგის დროს, Wi-Fi ხმოვანი ზარების ფიჭურ ქსელზე გადაცემის დაშვება"</string>
     <string name="home_settings" msgid="212375129455718176">"სახლი"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"მდებარეობის დასადგენად GPS, Wi‑Fi და ფიჭური ქსელების გამოყენება"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"მდებარეობის დასადგენად Wi‑Fi-ს და ფიჭური ქსელების გამოყენება"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ადგილმდებარეობის განსაზღვრისათვის, გამოიყენეთ GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"სკანირება"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"სკანირება"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ფიჭური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi-ს მიერ დადგენილი ადგილმდებარეობა"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM განბლოკვის ჩასართავად შეიყვანეთ თქვენი მოწყობილობის PIN"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"მისცეს ნება OEM განბლოკვას?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"გაფრთხილება: სანამ ეს პარამეტრი ჩართულია, მოწყობილობის დაცვის ფუნქცია ამ მოწყობილობაზე, ვერ იმუშავებს."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ჟურნალიზაციის ბუფერის ზომები"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"აირჩიეთ ჟურნ. ზომა / ჟურნ. ბუფერზე"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ნახვის ატრიბუტის ინსპექტირების ჩართვა"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ქსელი"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"უსადენო ეკრანის სერტიფიცირება"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi-ს დაწვრილებითი აღრიცხვის ჩართვა"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi-დან ფიჭურ კავშირზე პროაქტიური ჰენდოვერი"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi Roam სკანირების მუდამ დაშვება"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"მოძველებული DHCP კლიენტის გამოყენება"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"უსადენო ეკრანის სერტიფიცირების ვარიანტების ჩვენება"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi-ს აღრიცხვის დონის გაზრდა, Wi‑Fi ამომრჩეველში ყოველ SSID RSSI-ზე ჩვენება"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"თუ ჩართულია, Wi‑Fi სიგნალის შესუსტების შემთხვევაში Wi-Fi უფრო აქტიურად შეეცდება გადაიყვანოს ინტერნეტ-კავშირი მობილურ ინტერნეტზე"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ნახვის ატრიბუტის ინსპექტირების ჩართვა"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ახალი Android DHCP კლიენტის ნაცვლად, Lollipop-ის DHCP კლიენტის გამოყენება."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ჩავრთო USB გამართვა?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB გამართვა განკუთვნილია მხოლოდ დეველოპერული მიზნებისთვის. გამოიყენეთ კომპიუტერსა და თქვენ მოწყობილობას შორის მონაცემების გადასატანად, თქვენ მოწყობილობაზე აპების შეტყობინების გარეშე დასაყენებლად და ჟურნალის მონაცემების წასაკითხად."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"გავაუქმოთ ყველა იმ კომპიუტერიდან USB გამართვაზე წვდომა, რომლებიდანაც აქამდე განახორციელეთ შესვლა?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ქსელის კავშირი"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ტექსტი შეტყობინება SMS დამესიჯება მესიჯი"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"მობილური ფიჭური ოპერატორი უსადენო ინტერნეტი 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ზარი როუმინგულ გადართვაზე დარეკვისას"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ზარი დარეკვა"</string>
     <string name="keywords_home" msgid="3626170808219458848">"გამშვები"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ეკრანის სენსორი"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ეკრანის ჩაბნელება სენსორული ეკრანი ბატარეა"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"დაყენებულია <xliff:g id="COUNT">%d</xliff:g> აპი, სისტემური და ჩამოტვირთული აპების ჩათვლით"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 54d48f5..2664bb9 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Осы белгішені көргенде идентификациялау немесе сатып алуды авторизациялау үшін саусақ ізін пайдалануға болады."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Қосу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Келесі"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Саусақ ізі ішінара анықталды. Әрекетті қайталаңыз."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Саусақ ізі датчигі лас. Тазалап, әрекетті қайталаңыз."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Саусақ тым тез қозғалды. Әрекетті қайталаңыз."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Саусақ тым баяу қозғалды. Әрекетті қайталаңыз."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Өңдеу мүмкін болмады. Әрекетті қайталаңыз."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Жабдық қол жетімді емес."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Саусақ ізін сақтау мүмкін емес. Бар саусақ ізін жойыңыз."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Саусақ ізін күту уақыты бітті. Әрекетті қайталаңыз."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Кодтау"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Планшетті кодтау"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Телефонды кодтау"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi ұсынылған (Wi-Fi қол жетімсіз болса, ұялы байланысты пайдаланады)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Ұялы байланыс ұсынылған (ұялы байланыс қол жетімсіз болғанда ғана Wi-Fi пайдаланады)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Тек Wi-Fi (ұялы байл.ешқашан пайд-байды. Wi-Fi қол жетімсіз болса, қоңырау шалу не қаб.мүмкін емес)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Роумингте WFC бұру қызметі"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Роумингте Wi-Fi дауыстық қоңырауларын бұру қызметіне ұялы байланысқа рұқсат беру"</string>
     <string name="home_settings" msgid="212375129455718176">"Негізгі"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Орынды анықтау үшін GPS, Wi‑Fi және ұялы желілерді пайдалану"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Орынды анықтау үшін Wi‑Fi және ұялы желілерді пайдалану"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Орынды анықтау үшін GPS пайдаланыңыз"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Тексеруде"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Тексеруде"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi және ұялы желі арқылы орынды анықтау"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Аймақ Wi‑Fi арқылы анықталды"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM бекітпесін ашуды қосу үшін құрылғының PIN кодын енгізіңіз"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бекітпесін ашуға рұқсат ету керек пе?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЕСКЕРТУ: осы параметр қосулы кезде осы құрылғыда құрылғыны қорғау мүмкіндіктері жұмыс істемейді."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Журналға тіркеуші буферінің өлшемдері"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Әр журнал буфері үшін журналға тіркеуші өлшемдерін таңдау"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Жасанды аймақтарға рұқсат беру"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Аймақтарға еліктеу әрекетіне рұқсат беру"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Көру төлсипатын тексеруді қосу"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Желі орнату"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сымсыз дисплей сертификаты"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi егжей-тегжейлі журналға тір. қосу"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агрессивті Wi‑Fi жел. ұялы жел. ауыстыру"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi роумингін іздеулерге әрқашан рұқсат ету"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Бұрынғы DHCP клиентін пайдалану"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Сымсыз дисплей растау опцияларын көрсету"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi жур. тір. дең. арт., Wi‑Fi желісін таңдағышта әр SSID RSSI бойынша көрсету"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Қосылған болса, Wi‑Fi сигналы төмен болса, Wi‑Fi деректер байланысын ұялы желіге ауыстыруда көбірек агрессивті болады"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Жасанды аймақтарға рұқсат беру"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Аймақтарға еліктеу әрекетіне рұқсат беру"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Көру төлсипатын тексеруді қосу"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңа Android DHCP клиентінің орнына Lollipop ішіндегі DHCP клиентін пайдаланыңыз."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB жөндеулеріне рұқсат берілсін бе?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB жөндеу дамыту мақсаттарына ғана арналған. Оны компьютер және құрылғы арасында дерек көшіру, құрылғыға ескертусіз қолданба орнату және тіркелім деректерін оқу үшін қолданыңыз."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Бұған дейін рұқсат берген барлық компьютерлерден USB жөндеуге қол жетімділік тоқтатылсын ба?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi желі байланысы"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"мәтіндік хабар мәтіндік хабарлар жіберу хабар алмасу"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ұялы ұялы оператор сымсыз деректер 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi қоңырауын бағытын роумингтік бұр"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi қоңырау шалу"</string>
     <string name="keywords_home" msgid="3626170808219458848">"қосқыш"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорлы экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"экранды күңгірттеу сенсорлы экран батарея"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> қолданбаларымен қоса, жүйе мен жүктелген қолданбалар орнатылды"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 9280205..32d4930 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ អ្នកអាចប្រើស្នាមម្រាមដៃដើម្បីធ្វើជាអត្តសញ្ញាណ ឬដើម្បីអនុញ្ញាតការទិញ។"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"បន្ថែម"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"បន្ទាប់"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"បានផ្តិតយកស្នាមម្រាមដៃមិនពេញលក្ខណៈ។ សូមព្យាយាមម្តងទៀត។"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"ឧបករណ៍ផ្តិតម្រាមដៃប្រលាក់ហើយ។ សូមសម្អាត ហើយព្យាយាមម្តងទៀត។"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"ម្រាមដៃមានចលនារហ័សពេក។ សូមព្យាយាមម្តងទៀត។"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"ម្រាមដៃមានចលនាយឺតពេក។ សូមព្យាយាមម្តងទៀត។"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"មិនអាចដំណើរការបានទេ។ ព្យាយាមម្តងទៀត។"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"មិនមានផ្នែករឹងទេ។"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"មិនអាចផ្ទុកស្នាមម្រាមដៃទេ។ សូមយកស្នាមម្រាមដៃដែលមានស្រាប់ចេញ។"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"ការផ្តិតម្រាមដៃបានអស់ពេល។ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"គួរប្រើ Wi-Fi (ប្រើតែបណ្តាញទូរស័ព្ទប៉ុណ្ណោះ ប្រសិនមិនមាន Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"គួរប្រើបណ្តាញទូរស័ព្ទ (ប្រើតែ Wi-Fi ប៉ុណ្ណោះ ប្រសិនបើមិនមានបណ្តាញទូរស័ព្ទ)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi តែប៉ុណ្ណោះ (កុំប្រើបណ្តាញទូរស័ព្ទ។ មិនអាចធ្វើការហៅ និងទទួលការហៅបានទេប្រសិនបើមិនមាន Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ឆ្លាស់ទៅ WFC នៅពេលរ៉ូមីង"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"អនុញ្ញាតឲ្យការហៅជាសម្លេងតាម Wi-Fi ឆ្លាស់ទៅបណ្តាញទូរស័ព្ទនៅពេលរ៉ូមីង"</string>
     <string name="home_settings" msgid="212375129455718176">"ដើម"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ប្រើ ជីភីអេស, វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ប្រើ​វ៉ាយហ្វាយ និង​បណ្ដាញ​ចល័ត ដើម្បី​កំណត់​ទីតាំង"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ប្រើ GPS ដើម្បីកំណត់ទីតាំងរបស់អ្នក"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ការស្កេន"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ការស្កេន"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ទីតាំងបណ្ដាញចល័ត &amp; វ៉ាយហ្វាយ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"បញ្ចូល​កូដ PIN ឧបករណ៍​របស់​អ្នក ដើម្បី​បើក​ការ​ដោះ​សោ OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"អនុញ្ញាតការដោះសោ OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ព្រមាន៖ លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនដំណើរការនៅលើឧបករណ៍នេះទេ ខណៈពេលដែលការកំណត់នេះត្រូវបានបើក។"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ទំហំ buffer របស់ Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ជ្រើស​ទំហំ Logger per log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យ​ក្លែង​ទីតាំង"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាត​ទីតាំង​ក្លែងក្លាយ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"បើក​ការ​ត្រួតពិនិត្យ​គុណ​លក្ខណៈ​ទិដ្ឋភាព"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ការភ្ជាប់បណ្ដាញ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"បើក​កំណត់ហេតុ​រៀបរាប់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"វ៉ាយហ្វាយ​បង្ខំ​ទៅ​ការ​បញ្ជូន​ចល័ត"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"តែងតែ​អនុញ្ញាត​​​ការវិភាគ​រ៉ូម​វ៉ាយហ្វាយ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ប្រើម៉ាស៊ីនកូន DHCP ចាស់"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"បង្ហាញ​ជម្រើស​សម្រាប់​វិញ្ញាបនបត្រ​បង្ហាញ​ឥត​ខ្សែ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"បង្កើនកម្រិតកំណត់ហេតុវ៉ាយហ្វាយបង្ហាញក្នុង SSID RSSI ក្នុងកម្មវិធីជ្រើស​វ៉ាយហ្វាយ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ពេល​បាន​បើក វ៉ាយហ្វាយ​នឹង​កាន់តែ​បង្ខំ​ក្នុង​ការ​បញ្ជូន​ការ​ភ្ជាប់​ទិន្នន័យ​ទៅ​បណ្ដាញ​ចល័ត នៅ​ពេល​សញ្ញា​វ៉ាយហ្វាយ​យឺត"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យ​ក្លែង​ទីតាំង"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាត​ទីតាំង​ក្លែងក្លាយ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"បើក​ការ​ត្រួតពិនិត្យ​គុណ​លក្ខណៈ​ទិដ្ឋភាព"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ប្រើម៉ាស៊ីនកូន DHCP ចេញពី Lollipop ជំនួសឲ្យម៉ាស៊ីនកូន Android DHCP ថ្មី។"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"អនុញ្ញាត​ការ​កែ​កំហុស​យូអេសប៊ី?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"ការ​កែ​កំហុស​​យូអេសប៊ី​គឺ​សម្រាប់​តែ​ការ​អភិវឌ្ឍ​ប៉ុណ្ណោះ។ ប្រើ​វា​ដើម្បី​ចម្លង​ទិន្នន័យ​រវាង​កុំព្យូទ័រ និង​ឧបករណ៍​របស់​អ្នក ដំឡើង​កម្មវិធី​ក្នុង​ឧបករណ៍​របស់​អ្នក​ដោយ​មិន​ជូន​ដំណឹង និង​អាន​ទិន្នន័យ​កំណត់ហេតុ។"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ដក​សិទ្ធិ​ចូល​ការ​កែ​កំហុស​តាម​យូអេសប៊ី​ពី​គ្រប់​កុំព្យូទ័រ​ដែល​អ្នក​បាន​ផ្ដល់​សិទ្ធិ​ពី​មុន?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ការ​ភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"សារ​អត្ថបទ សរសេរ​សារ​អត្ថបទ ការ​ផ្ញើ​សារ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ចល័ត ចល័ត​ ក្រុមហ៊ុន​បញ្ជូន ឥត​ខ្សែ ទិន្នន័យ 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi call calling roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call calling"</string>
     <string name="keywords_home" msgid="3626170808219458848">"កម្មវិធី​ចាប់ផ្ដើម"</string>
     <string name="keywords_display" msgid="6709007669501628320">"អេក្រង់ ប៉ះ​អេក្រង់"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ធ្វើ​ឲ្យ​អេក្រង់​ព្រិល​ពេល​ប៉ះ​ថ្ម"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"បានដំឡើងកម្មវិធី <xliff:g id="COUNT">%d</xliff:g> រួមបញ្ចូលទាំងកម្មវិធីប្រព័ន្ធ និងកម្មវិធីដែលបានទាញយក"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 42ad7e4..22bc66f 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ನೀವು ಈ ಐಕಾನ್ ವೀಕ್ಷಿಸಿದಾಗ, ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಗುರುತಿಸುವಿಕೆಗೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲು ಬಳಸಬಹುದು."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ಸೇರಿಸು"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ಮುಂದೆ"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ಭಾಗಶಃ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಪತ್ತೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಕೊಳೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಅದನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"ಬೆರಳನ್ನು ವೇಗವಾಗಿ ಸರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"ಬೆರಳನ್ನು ನಿಧಾನವಾಗಿ ಸರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ಹಾರ್ಡ್‌ವೇರ್ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸಂಗ್ರಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ತೆಗೆದುಹಾಕಿ."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅವಧಿ ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ಎನ್‌ಕ್ರಿಪ್ಷನ್"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡು"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ (ಒಂದು ವೇಳೆ ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಮಾತ್ರ ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಬಳಸುತ್ತದೆ)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ಸೆಲ್ಯುಲಾರ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ (ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಮಾತ್ರ ವೈ-ಫೈ ಬಳಸುತ್ತದೆ)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"ವೈ-ಫೈ ಮಾತ್ರ (ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಎಂದಿಗೂ ಬಳಸುವುದಿಲ್ಲ. ಒಂದು ವೇಳೆ ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ WFC ಹ್ಯಾಂಡಾಫ್"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ವೈ-ಫೈ ಧ್ವನಿ ಕರೆಗಳ ಹ್ಯಾಂಡಾಫ್ ಅನ್ನು ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಅನುಮತಿಸು"</string>
     <string name="home_settings" msgid="212375129455718176">"ಮುಖಪುಟ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು Wi-Fi ಮತ್ತು ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಥಾನ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಾನ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM ಅನ್‌ಲಾಕ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಸಾಧನದ PIN ನಮೂದಿಸಿ"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM ಅನ್‌ಲಾಕ್‌ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ಎಚ್ಚರಿಕೆ: ಈ ಸೆಟ್ಟಿಂಗ್‌ ಆನ್‌ ಇರುವಾಗ ಈ ಸಾಧನದಲ್ಲಿ ಸಾಧನ ಸಂರಕ್ಷಣಾ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯ ನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ಲಾಗರ್ ಬಫರ್ ಗಾತ್ರಗಳು"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ಪ್ರತಿ ಲಾಗ್ ಬಫರ್‌ಗೆ ಲಾಗರ್ ಗಾತ್ರಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ನೆಟ್‌ವರ್ಕಿಂಗ್"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ವೆರ್ಬೋಸ್ ಲಾಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ಸೆಲ್ಯುಲರ್‌ ಹಸ್ತಾಂತರಿಸಲು ಆಕ್ರಮಣಕಾರಿ Wi‑Fi"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ವೈ-ಫೈ ರೋಮ್ ಸ್ಕ್ಯಾನ್‌ಗಳನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ಹಿಂದಿನ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ವೈರ್‌ಲೆಸ್‌‌‌ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣಕ್ಕಾಗಿ ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ಲಾಗಿಂಗ್ ಮಟ್ಟನ್ನು ಹೆಚ್ಚಿಸಿ, Wi‑Fi ಆಯ್ಕೆಯಲ್ಲಿ ಪ್ರತಿಯೊಂದು SSID RSSI ತೋರಿಸಿ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ಸಕ್ರಿಯಗೊಂಡರೆ, Wi‑Fi ಸಿಗ್ನಲ್ ದುರ್ಬಲವಾಗಿದ್ದರೂ ಕೂಡ, ಸೆಲ್ಯುಲರ್‌ಗೆ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಹಸ್ತಾಂತರಿಸುವಲ್ಲಿ Wi‑Fi ಹೆಚ್ಚು ಆಕ್ರಮಣಕಾರಿಯಾಗಿರುತ್ತದೆ"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ಹೊಸ Android DHCP ಕ್ಲೈಂಟ್ ಬದಲಾಗಿ Lollipop ನಿಂದ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯು ಅಭಿವೃದ್ಧಿ ಉದ್ದೇಶಗಳಿಗೆ ಮಾತ್ರ ಆಗಿದೆ. ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ನಡುವೆ ಡೇಟಾವನ್ನು ನಕಲಿಸಲು, ಅಧಿಸೂಚನೆ ಇಲ್ಲದೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಮತ್ತು ಲಾಗ್ ಡೇಟಾ ಓದಲು ಅದನ್ನು ಬಳಸಿ."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ನೀವು ಹಿಂದೆ ಅಧಿಕೃತಗೊಳಿಸಿದ ಎಲ್ಲ ಕಂಪ್ಯೂಟರ್‌ಗಳಿಂದ USB ಡೀಬಗ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ವೈಫೈ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ಪಠ್ಯ ಸಂದೇಶ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸಂದೇಶಗಳು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ಸೆಲ್ಯುಲಾರ್ ಸೆಲ್ ವಾಹಕ ವೈರ್‌ಲೆಸ್ ಡೇಟಾ 4g 3g 2g ಎಲ್‌ಟಿಇ"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"ವೈಫೈ ವೈ-ಫೈ ಕರೆ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ ರೋಮಿಂಗ್ ಹ್ಯಾಂಡಾಫ್"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ವೈಫೈ ವೈ-ಫೈ ಕರೆ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ಲಾಂಚರ್"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ಡಿಮ್‌‌ ಪರದೆ ಟಚ್‌ಸ್ಕ್ರೀನ್ ಬ್ಯಾಟರಿ"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"ಸಿಸ್ಟಮ್ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸೇರಿದಂತೆ, <xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1faa7ac..8a64906 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 증명하거나 구매를 승인할 수 있습니다."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"추가"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"다음"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"지문이 일부만 감지되었습니다. 다시 시도해 주세요."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"지문 센서가 더럽습니다. 깨끗이 닦고 다시 시도하세요."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"손가락을 너무 빨리 움직였습니다. 다시 시도해 주세요."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"손가락을 너무 느리게 움직였습니다. 다시 시도해 주세요."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"처리할 수 없습니다. 다시 시도하세요."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"하드웨어를 사용할 수 없습니다."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"지문을 저장할 수 없습니다. 기존 지문을 삭제하세요."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"지문 인식 시간이 초과되었습니다. 다시 시도하세요."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi를 기본으로 설정(Wi-Fi를 사용할 수 없는 경우에만 모바일 네트워크 사용)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"모바일 데이터를 기본으로 설정(모바일 네트워크를 사용할 수 없는 경우에만 Wi-Fi 사용)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi에서만(모바일 네트워크를 사용하지 않으며 Wi-Fi를 사용할 수 없는 경우 전화를 걸거나 받을 수 없음)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"로밍 시 Wi-Fi 통화 핸드오프"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"로밍 시 모바일 네트워크에 Wi-Fi 음성 통화 핸드오프 허용"</string>
     <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, Wi‑Fi 및 이동통신망을 사용하여 위치를 찾습니다."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wi‑Fi와 이동통신망을 사용하여 위치를 찾습니다."</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS를 사용하여 위치를 찾습니다."</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"검색 중"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"검색 중"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi 및 이동통신망 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM 잠금 해제를 사용하도록 설정하려면 기기 PIN을 입력하세요."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM 잠금 해제를 허용하시겠습니까?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"경고: 이 설정을 사용하는 동안에는 이 기기에서 기기 보호 기능이 작동하지 않습니다."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"로거 버퍼 크기"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"로그 버퍼당 로거 크기 선택"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"보기 속성 검사 사용"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"네트워크"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi 상세 로깅 사용"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi에서 데이터 네트워크로 적극 핸드오버"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi 로밍 스캔 항상 허용"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"이전 DHCP 클라이언트 사용"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"무선 디스플레이 인증서 옵션 표시"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi 로깅 수준을 높이고, Wi‑Fi 선택도구에서 SSID RSSI당 값을 표시합니다."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"사용 설정하면 Wi-Fi 신호가 약할 때 데이터 연결을 Wi-Fi에서 데이터 네트워크로 더욱 적극적으로 핸드오버합니다."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"보기 속성 검사 사용"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"새로운 Android DHCP 클라이언트 대신 Lollipop의 DHCP 클라이언트 사용"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 디버깅은 개발용으로만 설계되었습니다. 이 기능을 사용하면 컴퓨터와 기기 간에 데이터를 복사하고 알림 없이 기기에 앱을 설치하며 로그 데이터를 읽을 수 있습니다."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"이전에 승인한 모든 컴퓨터에서 USB 디버깅에 대한 액세스 권한을 취소하시겠습니까?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi 네트워크 연결"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"문자 메시지 문자 메시지 전송 메시지"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"휴대전화 셀 이동통신사 무선 데이터 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"Wi-Fi Wi-Fi 전화 통화 로밍 핸드오프"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"Wi-Fi Wi-Fi 전화 통화"</string>
     <string name="keywords_home" msgid="3626170808219458848">"런처"</string>
     <string name="keywords_display" msgid="6709007669501628320">"화면 터치스크린"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"화면 어둡게 하기 터치스크린 배터리"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"시스템 앱과 다운로드한 앱을 포함하여 <xliff:g id="COUNT">%d</xliff:g>개의 앱이 설치되었습니다."</string>
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 1ae0ea5..d61dee1 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -551,14 +551,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Бул сөлөкөттү качан көрсөңүз да аныктоо же сатып алууга уруксат берүү үчүн манжа изиңизди пайдалана аласыз."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Манжа изи жарым-жартылай аныкталды. Кайра аракет кылыңыз."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Манжа изинин сенсору кирдеп калган. Тазалап, кайра аракет кылыңыз."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Манжа өтө тез жылдырылды. Кайра аракет кылыңыз."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Манжа өтө жай жылдырылды. Кайра аракет кылыңыз."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Иштетилбей жатат. Кайра аракет кылыңыз."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Аппараттык камсыздоо жеткиликтүү эмес."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Манжа изин сактоо мүмкүн эмес. Учурдагы манжа изин алып салыңыз."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Манжа изин күтүү мөөнөтү бүттү. Кайра аракет кылыңыз."</string>
     <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
@@ -1051,8 +1043,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi тандалган (Эгер Wi-Fi болбосо, уюлдук тармакты гана колдонот)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Уюлдук тармак тандалган (Эгер уюлдук тармак жеткиликтүү эмес болсо, Wi-Fi гана пайдаланат)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi гана (Эч качан уюлдук тармак колдонбойт. Эгер Wi-Fi болбосо, чалуу жасап же кабыл ала албайт)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Роуминг учурунда WFC өткөрүү"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Роуминг учурунда Wi-Fi үн чалууларын уюлдук тармакка өткөрүүгө уруксат берүү"</string>
     <string name="home_settings" msgid="212375129455718176">"Үйгө"</string>
     <!-- no translation found for display_settings_title (1708697328627382561) -->
     <skip />
@@ -1599,10 +1589,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Жайгашкан жерди аныктоо үчүн Wi‑Fi жана уюктук тармактарды колдонуңуз"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонуңуз"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скандалууда…"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скандалууда…"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; уюкт тарм жайг жер"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -2091,10 +2079,19 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM кулпуну ачууну иштетүү үчүн түзмөгүңүздүн PIN\'ин киргизиңиз"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM бөгөттөн чыгарууга уруксатпы?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЭСКЕРТҮҮ: Бул жөндөө күйгүзүлүп турганда түзмөктү коргоо өзгөчөлүктөрү иштебейт."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Каттагыч буферлеринин өлчөмдөрү"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Каттоо буфери үчүн Каттагычтын көлөмүн тандаңыз"</string>
+    <!-- no translation found for allow_mock_location (2787962564578664888) -->
+    <skip />
+    <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
+    <skip />
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Аттрибут текшерүүсүнүн көрүнүшүн иштетүү"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Тармактык байланыштарды кеңейтүү"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Зымсыз дисплейди аныктоо"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Уюктук хэндоверге өжөр Wi-Fi"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi Роуминг Скандоо мүмкүнчүлүгүнө ар дайым уруксат берилсин"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Эскирген DHCP кардарын колдонуу"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Зымсыз дисплейди сертификатто мүмкүнчүлүктөрүн көргөзүү"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi Кармагычта Wi‑Fi протокол деңгээлин жогорулатуу жана ар бир SSID RSSI үчүн көрсөтүү."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Иштетилгенде, Wi-Fi байланышы үзүл-кесил болуп жатканда, Wi-Fi дайындарды уюктук операторго өжөрлүк менен өткөрөт."</string>
@@ -2108,6 +2105,7 @@
     <!-- no translation found for allow_mock_location_summary (317615105156345626) -->
     <skip />
     <string name="debug_view_attributes" msgid="6485448367803310384">"Аттрибут текшерүүсүнүн көрүнүшүн иштетүү"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Жаңы Android DHCP кардарынын ордуна Lollipop\'тон DHCP кардарын колдонуңуз."</string>
     <!-- no translation found for adb_warning_title (6234463310896563253) -->
     <skip />
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-жөндөө - өндүрүү максатында гана  түзүлгөн. Аны компүтериңиз менен түзмөгүңүздүн ортосунда берилиштерди алмашуу, түзмөгүңүзгө колдонмолорду эскертүүсүз орнотуу жана лог берилиштерин окуу үчүн колдонсоңуз болот."</string>
@@ -3238,7 +3236,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi түйүнүнө байланышуу"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS билдирүү SMS билдирүүлөрүн жазышуу билдирүү жазышуу"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"уюлдук уюл оператор зымсыз дайындар 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi чалуу чалууда роуминг өткөрүү"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi чалуу чалуу"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ишке киргизгич"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран, сенсордук экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"күңүрт экран сенсордук экран батарея"</string>
@@ -3438,4 +3436,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> колдонмо орнотулду, анын ичинде тутумдук жана жүктөлүп алынган колдонмолор бар"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a73055d..0ac1ecb 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ທຸກ​ຄັ້ງ​ທີ່​ທ່ານ​ເຫັນ​ໄອ​ຄອນ​ນີ້, ທ່ານ​ສາ​ມາດ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ສຳ​ລັບ​ການ​ລະ​ບຸ ຫຼື​ເພື່ອ​ໃຫ້​ສິດ​ການ​ຊື້."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ເພີ່ມ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ຕໍ່​ໄປ"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ກວດ​ພົບ​ລາຍ​ນີ້ວ​ມື​ບາງ​ສ່ວນ​ແລ້ວ. ກະ​ລຸ​ນາ​ລອງ​ໃໝ່​ອີກ."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"ເຊັນ​ເຊີ​ລາຍ​ນີ້ວ​ມື​ເປື້ອນ. ກະ​ລຸ​ນາ​ທຳ​ຄວາມ​ສະ​ອາດ ແລະ​ລອງ​ໃໝ່​ອີກ."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"ຍ້າຍ​ນີ້ວ​ມື​ໄປ​ໄວ​ເກີນ​ໄປ. ກະ​ລຸ​ນາ​ລອງ​ໃໝ່​ອີກ."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"ຍ້າຍ​ນີ້ວ​ມື​ໄປ​ຊ້າເກີນ​ໄປ. ກະ​ລຸ​ນາ​ລອງ​ໃໝ່​ອີກ."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ບໍ່​ສາ​ມາດ​ປະ​ມວນ​ຜົນ​ໄດ້. ລອງ​ໃໝ່​ອີກ."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ບໍ່​ມີ​ຮາດ​ແວ​ໃຫ້​ຢູ່."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ບໍ່​ສາ​ມາດ​ເກັບ​ຮັກ​ສາ​ລາຍ​ນີ້ວ​ມື​ໄວ້​ໄດ້. ກະ​ລຸ​ນາ​ເອົາ​ລາຍ​ນີ້ວ​ມື​ທີ່​ມີ​ຢູ່​ອອກ​ໄປ."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"ເວ​ລາ​ລາຍ​ນີ້ວ​ມື​ບໍ່​ເຂົ້າ​ເຖິງ​ໄດ້. ລອງ​ໃໝ່​ອີກ."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ການເຂົ້າລະຫັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ເລືອກໃຊ້ Wi-Fi ກ່ອນ (ໃຊ້ເຄືອຂ່າຍເຊລລູລາ ຖ້າ Wi-Fi ບໍ່ສາມາດໃຊ້ງານໄດ້ເທົ່ານັ້ນ)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ເລືອກໃຊ້ເຊລລູລາກ່ອນ (ໃຊ້ Wi-Fi ຖ້າເຄືອຂ່າຍເຊລລູລາບໍ່ສາມາດໃຊ້ງານໄດ້ເທົ່ານັ້ນ)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi ເທົ່ານັ້ນ (ຢ່າໃຊ້ເຄືອຂ່າຍເຊລລູລາ. ບໍ່ສາມາດໂທອອກ ຫຼືຮັບສາຍໄດ້ ຖ້າ Wi-Fi ບໍ່ສາມາດໃຊ້ງານໄດ້)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ການສົ່ງຕໍ່ WFC ໃນຂະນະໂຣມມິງ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ອະນຸຍາດການສົ່ງຕໍ່ການໂທດ້ວຍສຽງຜ່ານ Wi-Fi ເປັນເຄືອຂ່າຍເຊລລູລາ ເມື່ອໂຣມມິງ"</string>
     <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ໃຊ້ GPS, Wi‑Fi ແລະ​ເຄືອ​ຂ່າຍ​ມື​ຖືເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ໃຊ້ເຄືອ​ຂ່າຍ Wi‑Fi ແລະ​ມື​ຖື​ເພື່ອ​ລະ​ບຸ​ຕຳ​ແໜ່ງ​ທີ່​ຢູ່"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອກຳ​ນົດ​ທີ່​ຕັ້ງຂອງທ່ານ"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ກຳລັງສະແກນ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ກຳລັງສະແກນ"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; ທີ່​ຢູ່​ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ສະຖານທີ່ທີ່ລະບຸໂດຍ Wi-Fi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"​ປ້ອນ​ລະ​ຫັດ PIN ​ຂອງ​ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ເພື່ອ​ເປີດ​ນຳ​ໃຊ້​ການ​ປົດ​ລັອກ OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"ອະ​ນຸ​ຍາດ​ການ​ປົກ​ລັອກ OEM ບໍ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ຄຳ​ເຕືອນ: ຄຸນ​ສົມ​ບັດ​ປົກ​ປ້ອງ​ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ເຮັດ​ວຽກຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້ ໃນ​ຂະ​ນະ​ທີ່​ການ​ຕັ້ງ​ຄ່ານີ້​ເປີດ​ຢູ່."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ຂະ​ໜາດ​​ບັບ​ເຟີໂຕ​ລັອກ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ເລືອກ​ຂະ​ໜາດ​ລັອກ​ຕໍ່​ບັບ​ເຟີ"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ເປີດ​ນຳ​ໃຊ້​ການກວດ​ສອບ​ຄຸນ​ສົມ​ບັດ​ມຸມມອງ"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ການ​ສ້າງເຄືອຂ່າຍ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"​ເປີດ​ນຳ​ໃຊ້ການ​ເກັບ​ປະ​ຫວັດ​ Verbose Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ໃຫ້​ບຸລິມະສິດ​ການ​ປ່ຽນ​ຈາກ Wi-Fi ເປັນ​ເຄືອ​​ຂ່າຍ​ໂທ​ລະ​ສັບ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ອະ​ນຸ​ຍາດ​ການ​ສະ​ແກນ​ການ​ໂຣມ Wi‑Fi ​ສະ​ເໝີ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ໃຊ້​ລູກ​ຄ້າ DHCP ຕຳ​ນານ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ສະແດງໂຕເລືອກສຳລັບການສະແດງການຮັບຮອງລະບົບໄຮ້ສາຍ"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"ເພີ່ມ​ລະ​ດັບ​ການ​ເກັບ​ປະ​ຫວັດ Wi‑Fi, ສະ​ແດງ​ຕໍ່ SSID RSSI ​ໃນ​ Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ເມື່ອ​ເປີດ​ນຳ​ໃຊ້​ແລ້ວ, ເຄືອ​ຂ່າຍ Wi-Fi ຈະ​ຖືກ​ປ່ຽນ​ໄປ​ໃຊ້​ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ​ແທນ​ຫາກ​ສັນ​ຍານ Wi-Fi ອ່ອນ"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ເປີດ​ນຳ​ໃຊ້​ການກວດ​ສອບ​ຄຸນ​ສົມ​ບັດ​ມຸມມອງ"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ໃຊ້​ລູກ​ຄ້າ DHCP ຈາກ Lollipop ແທນ​ລູກ​ຄ້າ Android DHCP ໃໝ່."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ອະນຸຍາດໃຫ້ດີບັ໊ກຜ່ານ USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"ການດີບັ໊ກຜ່ານ USB ແມ່ນມີຈຸດປະສົງເພື່ອການພັດທະນາເທົ່ານັ້ນ. ມັນສາມາດໃຊ້ເພື່ອສຳເນົາຂໍ້ມູນລະຫວ່າງຄອມພິວເຕີ ແລະອຸປະກອນຂອງທ່ານ, ຕິດຕັ້ງແອັບຯໂດຍບໍ່ຜ່ານການແຈ້ງເຕືອນ ແລະອ່ານຂໍ້ມູນການບັນທຶກ."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ຖອດຖອນການເຂົ້າເຖິງການດີບັ໊ກຜ່ານ USB ຈາກຄອມພິວເຕີທຸກເຄື່ອງ ທີ່ທ່ານເຄີຍອະນຸຍາດກ່ອນໜ້ານີ້?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"​ຂໍ້​ຄວາມ ການ​ສົ່ງ​ຂໍ້​ຄວາມ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ເຄືອ​ຂ່າຍ​ໂທ​ລະ​ສັບ ເຄືອ​ຂ່າຍ ຜູ່​ໃຫ້​ບໍ​ລິ​ການ ໄຮ້​ສາຍ ຂໍ້​ມູນ 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ໂທ ການໂທ ການໂຣມມິງ ການສົ່ງຕໍ່"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ການ​ໂທ​ໂທ wifi wi-fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"​ລອນ​ເຊີ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ໜ້າຈໍ ໜ້າຈໍສຳຜັດ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"​ຄ່ອຍ​ແສງ​ໜ້າ​ຈໍ ໜ້າ​ຈໍ​ແຕະ ແບັດ​ເຕີ​ຣີ"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ແອັບ​ຖືກ​ຕິດ​ຕັ້ງ​ແລ້ວ, ລວມ​ທັງ​ລະ​ບົບ ແລະ​ແອັບ​ທີ່​ດາວ​ໂຫຼດ​ແລ້ວ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 833f364..2cf3ed0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kai rodoma ši piktograma, galite naudoti kontrolinį kodą tapatybei nustatyti ar pirkimo operacijai autorizuoti."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pridėti"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Kitas"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Aptiktas dalinis kontrolinis kodas. Bandykite dar kartą."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Kontrolinio kodo jutiklis purvinas. Nuvalykite ir bandykite dar kartą."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Per greitai judinate pirštą. Bandykite dar kartą."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Per lėtai judinate pirštą. Bandykite dar kartą."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Nepavyko apdoroti. Bandykite dar kartą."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Aparatinė įranga nepasiekiama."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Negalima išsaugoti kontrolinio kodo. Pašalinkite esamą kontrolinį kodą."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Baigėsi kontrolinio kodo nustatymo skirtasis laikas. Bandykite dar kartą."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Pageidautinas „Wi-Fi“ ryšys (Mobiliojo ryšio tinklas naudojamas, tik jei „Wi-Fi“ r. t. nepasiek.)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Pageidautinas mobilusis ryšys („Wi-Fi“ ryšio t. naudojamas, tik jei mobiliojo r. tinklas nepasiek.)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tik „Wi-Fi“ (Mob. r. t. niekada nenaud. Jei „Wi-Fi“ r. t. nepas., negalima atlikti ir gauti skamb.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"„Wi-Fi“ b. skamb. perd., kai veikia tarpt. r."</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Leisti „Wi-Fi“ balso skamb. perdavimą į mob. r. tinklą, kai veikia tarptinkl. r."</string>
     <string name="home_settings" msgid="212375129455718176">"Pagrindinis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Naudoti GPS, „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Naudoti „Wi‑Fi“ ir korinį tinklą vietovei nustatyti"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Nustatyti vietovę naudojant GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Nuskaitymas"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nuskaitymas"</string>
     <string name="location_network_based" msgid="6010456018401296590">"„Wi‑Fi“ ir kor. tinkl. 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>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Įveskite įrenginio PIN kodą, kad įgalintumėte OĮG operatoriaus pasirinkimo ribojimo panaikinimą"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Leisti OĮG atrakinimą?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ĮSPĖJIMAS: kol šis nustatymas bus įjungtas, šiame įrenginyje neveiks įrenginio apsaugos funkcijos."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Registruotuvo biuferio dydžiai"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pasir. registr. dydž. žurn. bufer."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Įgalinti peržiūros atributų tikrinimą"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tinklai"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Belaidžio rodymo sertifikavimas"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Įgal. „Wi‑Fi“ daugiaž. įraš. į žurnalą"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. „Wi‑Fi“ duom. perd. į mob. tinklą"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Visada leisti „Wi-Fi“ tarptiklinio ryšio nuskaitymą"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Naudoti seną DHCP kliento programą"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rodyti belaidžio rodymo sertifikavimo parinktis"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Padidinti „Wi‑Fi“ įrašymo į žurnalą lygį, rodyti SSID RSSI „Wi-Fi“ rinkiklyje"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Jei įgalinta ši parinktis, „Wi‑Fi“ agresyviau perduos duomenų ryšį į mobiliojo ryšio tinklą, kai „Wi‑Fi“ signalas bus silpnas"</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Įgalinti peržiūros atributų tikrinimą"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"DHCP kliento programos iš „Lollipop“ versijos naudojimas vietoje naujos „Android“ DHCP kliento programos."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB derinimas skirtas naudoti tik kūrimo tikslais. Jis gali būti naudojamas norint kopijuoti duomenis iš kompiuterio į įrenginį ir atvirkščiai, įdiegti programas įrenginyje be pranešimo ir skaityti žurnalo duomenis."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Panaikinti visų kompiuterių, kuriems anksčiau suteikėte prieigos teisę, prieigą prie USB derinimo?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"teksto pranešimas siųsti žinutę pranešimai susirašinėjimas žinutėmis"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilusis mobiliojo ryšio operatorius belaidis ryšys duomenys 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"„Wi-Fi“, skambutis, skambinama, tarptinklinis ryšys, perdavimas"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"„Wi-Fi“ skambutis skambinama"</string>
     <string name="keywords_home" msgid="3626170808219458848">"paleidimo priemonė"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekranas jutiklinis ekranas"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"pritemdytas ekranas jutiklinis ekranas akumuliatorius"</string>
@@ -2411,7 +2407,7 @@
     <string name="keywords_users" msgid="4673901601478559100">"apribojimas riboti apribota"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksto pataisymas pataisyti garsas vibruoti automatinis kalba gestas pasiūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukai tarptautinis"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"nustatyti iš naujo nuostatos numatytosios"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"programos atsisiųsti sistema"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"programos atsisiųsti programos sistema"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2585,8 +2581,9 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Užblokuoti"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritetiniai"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Neskelbtini"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Iš naujo nustatyti visų programų nuostatas į numatytąsias"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Nustatyti iš naujo visų programų nuostatas į numatytąsias"</string>
     <string name="all_apps_summary" msgid="3754827293203127282">"Įdiegta programų: <xliff:g id="COUNT">%d</xliff:g> (įskaitant sistemos ir atsisiųstas programas)"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2916fd6..220e0b6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kad tiek rādīta šī ikona, varat izmantot pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pievienot"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tālāk"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Noteikts daļējs pirksta nospiedums. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Pirkstu nospiedumu sensors ir netīrs. Lūdzu, notīriet to un mēģiniet vēlreiz."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Pārāk ātra pirksta kustība. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Pārāk lēna pirksta kustība. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Nevar apstrādāt pirksta nospiedumu. Mēģiniet vēlreiz."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Aparatūra nav pieejama."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Pirkstu nospiedumu nevar saglabāt. Lūdzu, noņemiet esošu pirksta nospiedumu."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Pirkstu nospiedumu nolasīšanas aparatūras noildze. Mēģiniet vēlreiz."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Tālruņa šifrēšana"</string>
@@ -759,8 +751,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Vēlams Wi-Fi tīkls (Izmanto mobilo tīklu tikai tad, ja Wi-Fi tīkls nav pieejams.)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Vēlams mobilais tīkls (Izmanto Wi-Fi tīklu tikai tad, ja nav pieejams mobilais tīkls.)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tikai Wi-Fi (Neizmanto mobilo tīklu. Nevar veikt vai saņemt zvanus, ja Wi-Fi tīkls nav pieejams.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Wi-Fi zvanu pāradresācija viesabonējot"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Atļaut Wi-Fi balss zvanu pāradresāciju uz mobilo tīklu viesabonēšanas laikā"</string>
     <string name="home_settings" msgid="212375129455718176">"Sākums"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
@@ -1128,10 +1118,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Izmantojiet GPS, Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Izmantojiet Wi-Fi un mobilos tīklus, lai noteiktu atrašanās vietu."</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Lietot GPS atrašanās vietas noteikšanai"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Pārbaudīšana"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Pārbaudīšana"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi un mobilo 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>
@@ -1461,10 +1449,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Lai iespējotu OEM atbloķēšanu, ievadiet ierīces PIN kodu."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vai atļaut OEM atbloķēšanu?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BRĪDINĀJUMS. Kamēr šis iestatījums būs ieslēgts, ierīces aizsardzības funkcijas nedarbosies."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Reģistrētāja buferu lielumi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Atlasīt reģistrētāja bufera liel."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Iespējot skata atribūta pārbaudi"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tīklošana"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Bezvadu attēlošanas sertifikācija"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Iespējot Wi‑Fi detalizēto reģistrēšanu"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresīva pāreja no Wi‑Fi uz mobilo tīklu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vienmēr atļaut Wi‑Fi meklēšanu"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Lietot mantoto DHCP klientu"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rādīt bezvadu attēlošanas sertifikācijas iespējas"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Palieliniet Wi‑Fi reģistrēšanas līmeni; rādīt katram SSID RSSI Wi‑Fi atlasītājā."</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ja opcija ir iespējota un Wi‑Fi signāls ir vājš, datu savienojuma pāreja no Wi-Fi uz mobilo tīklu tiks veikta agresīvāk."</string>
@@ -1476,6 +1471,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Iespējot skata atribūta pārbaudi"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Lietot DHCP klientu no operētājsistēmas Lollipop, nevis jauno Android DHCP klientu."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB atkļūdošana ir paredzēta tikai ar izstrādi saistītām darbībām. Izmantojiet to datu kopēšanai no datora uz ierīci un pretēji, lietotņu instalēšanai ierīcē bez paziņojumiem un žurnāla datu lasīšanai."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vai atcelt piekļuvi USB atkļūdošanai no visiem datoriem, kuriem iepriekš piešķīrāt piekļuvi?"</string>
@@ -2376,7 +2372,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi tīkls savienojums"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"īsziņa sūtīt īsziņu ziņas ziņojumapmaiņa"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilais operators bezvadu dati 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi zvans zvani viesabonēšana pāradresācija"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi zvans zvanīšana"</string>
     <string name="keywords_home" msgid="3626170808219458848">"palaišanas programma"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekrāns skārienekrāns"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tumšs ekrāns skārienekrāns akumulators"</string>
@@ -2577,4 +2573,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Instalētas <xliff:g id="COUNT">%d</xliff:g> lietotnes, tostarp lejupielādētās un sistēmas lietotnes"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0484f00..4c792e3 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Секогаш кога ќе ја видите оваа икона, може да го користите вашиот отпечаток за идентификација или да авторизирате купување."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додај"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Откриен е делумен отпечаток. Обидете се повторно."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Сензорот за отпечатоци е валкан. Исчистете го и обидете се повторно."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Прстот се движеше премногу брзо. Обидете се повторно."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Прстот се движеше премногу бавно. Обидете се повторно."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Не може да се обработи. Обидете се повторно."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Хардверот не е достапен."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Отпечатокот не може да се складира. Отстранете го постоечкиот отпечаток."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Достигнато е време на истекување на отпечатокот. Обидете се повторно."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрирање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрирај таблет"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрирај телефон"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Се претпочита Wi-Fi (Користи мобилна мрежа само ако Wi-Fi не е достапна)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Се претпочита мобилна (Користи Wi-Fi само ако не е достапна мобилна мрежа)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само Wi-Fi (Никогаш не користи мобил. мрежа. Не може да воспоставува повици ако Wi-Fi не е достапна)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Испорака на WFC во роаминг"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Дозволете испорака на говорни повици преку Wi-Fi до мобилна мрежа во роаминг"</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна страница"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Користи мрежи на GPS, на Wi‑Fi и на мобилен за да утврдиш локација"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Користи мрежи на Wi‑Fi и на мобилен за да утврдиш локација"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користи ГПС за да се утврди локацијата"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Се скенира"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Се скенира"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на мр. на Wi‑Fi и на моб."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"За брза процена, овозможи услуга за локација на Google. Анонимните податоци за локација се собираат и се испраќаат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локацијата е утврдена со Wi-Fi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Внесете го ПИН-кодот на уредот за да овозможите отклучување со OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволете отклучување со OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПРЕДУПРЕДУВАЊЕ: функциите за заштита на уредот нема да работат на овој уред додека е вклучена оваа поставка."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Величини на меѓумеморија на забележувач"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Величина/меѓумеморија на дневник"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Овозможи лажни локации"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Овозможи лажни локации"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Овозможете проверка на атрибутот на приказот"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Вмрежување"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Приказ на сертификација на безжична мрежа"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Овозможи преопширно пријавување Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресивно предавање од Wi‑Fi на мобилен"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Секогаш дозволувај Wi‑Fi скенирање во роаминг"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Користете наследен клиент на DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Покажи ги опциите за безжичен приказ на сертификат"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Зголеми Wi‑Fi ниво на пријавување, прикажи по SSID RSSI во Wi‑Fi бирач"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Кога е вклучено, Wi-Fi ќе биде поагресивно при предавање на поврзувањето со податоци на мобилната мрежа при слаб сигнал на Wi-Fi."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Овозможи лажни локации"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Овозможи лажни локации"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Овозможете проверка на атрибутот на приказот"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користете го клиентот на DHCP од Lollipop наместо новиот клиент на DHCP на Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Овозможи отстранување грешки на УСБ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отстранувањето грешки на УСБ е наменето само за целите на развој. Користете го за копирање податоци меѓу вашиот компјутер и вашиот уред, за инсталирање апликации на вашиот уред без известување и за читање евиденција на податоци."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Отповикај пристап кон отстранување грешка од УСБ од сите претходно овластени компјутери?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежно поврзување"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстуална порака испраќање текстуални пораки пораки испраќање пораки"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилна мрежа мобилен оператор безжичен податоци 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi повикај повикување роаминг испорака"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi повикај повикување"</string>
     <string name="keywords_home" msgid="3626170808219458848">"стартер"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран екран на допир"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемни екран екран на допир батерија"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> инсталирани апликации, вклучувајќи системски и преземени апликации"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index ea47141..049a2f5 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോഴെല്ലാം, തിരിച്ചറിയാനോ ഒരു വാങ്ങലിന് അംഗീകാരം നൽകാനോ വിരലടയാളം ഉപയോഗിക്കാനാകും."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ചേർക്കുക"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"അടുത്തത്"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"വിരലടയാളം ഭാഗികമായി തിരിച്ചറിഞ്ഞു. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"വിരലടയാള സെൻസറിന് വൃത്തിയില്ല. അത് ശുചിയാക്കി വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"വിരൽ വേഗത്തിൽ നീക്കി. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"വിരൽ പതുക്കെ നീക്കി. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"പ്രോസസ്സ് ചെയ്യാനാവുന്നില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ഹാർഡ്‌വെയർ ലഭ്യമല്ല."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"വിരലടയാളം സംഭരിക്കാനാവില്ല. നിലവിലുള്ള വിരലടയാളം നീക്കംചെയ്യുക."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"വിരലടയാളം നൽകേണ്ട സമയം കഴിഞ്ഞു. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"എൻ‌ക്രിപ്ഷൻ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ടാ‌ബ്‌ലെറ്റ് എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ഫോൺ എൻ‌ക്രിപ്റ്റുചെയ്യുക"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi തിരഞ്ഞെടുത്തിരിക്കുന്നു (Wi-Fi ലഭ്യമല്ലെങ്കിൽ മാത്രം സെൽ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കുന്നു)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"സെല്ലുലാർ തിരഞ്ഞെടുത്തിരിക്കുന്നു (സെൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ലെങ്കിൽ മാത്രം Wi-Fi ഉപയോഗിക്കുന്നു)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi മാത്രം (ഒരിക്കലും സെൽ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കുന്നില്ല. Wi-Fi ലഭ്യമല്ലെങ്കിൽ കോളുകൾ വിളിക്കാനോ സ്വീകരിക്കാനോ കഴിയില്ല)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"റോമിംഗിലായിരിക്കുമ്പോൾ WFC ഹാൻഡ്ഓഫ്"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"റോമിംഗിലായിരിക്കുമ്പോൾ സെൽ നെറ്റ്‌വർക്കിലേക്ക് Wi-Fi വോയ്‌സ് കോൾ ഹാൻഡ്ഓഫ് അനുവദിക്കുക"</string>
     <string name="home_settings" msgid="212375129455718176">"ഹോം"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ദൃശ്യമാക്കുക"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS, Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുക"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ലൊക്കേഷൻ നിർണ്ണയിക്കാൻ GPS ഉപയോഗിക്കുക"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"സ്കാൻ ചെയ്യുന്നു"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"സ്കാൻ ചെയ്യുന്നു"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi, സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലൊക്കേഷൻ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"നിങ്ങളുടെ ലൊക്കേഷൻ വേഗത്തിൽ നിർണ്ണയിക്കാൻ Google-ന്റെ ലൊക്കേഷൻ സേവനം ഉപയോഗിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. അജ്ഞാത ലൊക്കേഷൻ ഡാറ്റ ശേഖരിച്ച് Google-ന് അയയ്‌ക്കും."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi നിർണ്ണയിച്ച ലൊക്കേഷൻ"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM അൺലോക്ക് പ്രവർത്തനക്ഷമമാക്കുന്നതിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ PIN നൽകുക"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM അൺലോക്കുചെയ്യൽ അനുവദിക്കണോ?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"മുന്നറിയിപ്പ്: ഈ ക്രമീകരണം ഓണായിരിക്കുമ്പോൾ, ഉപകരണ സുരക്ഷാ ഫീച്ചറുകൾ ഈ ഉപകരണത്തിൽ പ്രവർത്തിക്കില്ല."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ലോഗർ ബഫർ വലുപ്പം"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ഓരോ ലോഗ് ബഫറിനും ലോഗർ വലുപ്പം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"ആട്രിബ്യൂട്ട് പരിശോധന കാണുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"നെറ്റ്‍വര്‍ക്കിംഗ്"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷൻ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi വെർബോസ് ലോഗിംഗ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"സെല്ലുലാർ ഹാൻഡ്ഓവറിലേക്ക് വൈഫൈ അഗ്രസ്സീവാക്കുക"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"എല്ലായ്‌പ്പോഴും വൈഫൈ റോം സ്‌‌കാനുകൾ അനുവദിക്കുക"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"പഴയ DHCP ക്ലയന്റ് ഉപയോഗിക്കുക"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"വയർലെസ് ഡിസ്‌പ്ലേ സർട്ടിഫിക്കേഷനായി ഓപ്‌ഷനുകൾ ദൃശ്യമാക്കുക"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi പിക്കറിൽ ഓരോ SSID RSSI പ്രകാരം കാണിക്കാൻ Wi‑Fi ലോഗിംഗ് നില വർദ്ധിപ്പിക്കുക"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"പ്രവർത്തനക്ഷമമായിരിക്കുമ്പോൾ, വൈഫൈ സിഗ്‌നൽ കുറവായിരിക്കുന്ന സമയത്ത് സെല്ലുലാറിലേക്ക് ഡാറ്റ കണക്ഷൻ മുഖേന കൈമാറുന്നതിൽ വൈഫൈ കൂടുതൽ പ്രവർത്തനക്ഷമമാകും"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"വ്യാജ ലൊക്കേഷനുകൾ അനുവദിക്കുക"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"ആട്രിബ്യൂട്ട് പരിശോധന കാണുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"പുതിയ Android DHCP ക്ലയന്റിനുപകരം Lollipop-ൽ നിന്ന് DHCP ക്ലയന്റ് ഉപയോഗിക്കുക."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ഡീബഗ്ഗുചെയ്യാൻ അനുവദിക്കണോ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB ഡീബഗ്ഗിംഗ് വികസന ആവശ്യകതകൾക്ക് മാത്രമുള്ളതാണ്. നിങ്ങളുടെ കമ്പ്യൂട്ടറിനും ഉപകരണത്തിനുമിടയിൽ ഡാറ്റ പകർത്തുന്നതിനും അറിയിപ്പില്ലാതെ തന്നെ നിങ്ങളുടെ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകൾ ഇൻസ്‌റ്റാളുചെയ്യുന്നതിനും ലോഗ് ഡാറ്റ റീഡുചെയ്യുന്നതിനും ഇത് ഉപയോഗിക്കുക."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"നിങ്ങൾ മുമ്പ് അംഗീകരിച്ച എല്ലാ കമ്പ്യൂട്ടറുകളിൽ നിന്നും USB ഡീബഗ്ഗുചെയ്യുന്നതിനുള്ള ആക്‌സസ്സ് പിൻവലിക്കണോ?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"വൈഫൈ വൈഫൈ നെറ്റ്‌വർക്ക് കണക്ഷൻ"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ടെക്‌സ്‌റ്റ് സന്ദേശം ടെക്സ്റ്റുചെയ്യൽ സന്ദേശങ്ങൾ സന്ദേശമയയ്‌ക്കൽ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"സെല്ലുലാർ സെൽ കാരിയർ വയർലെസ്സ് ഡാറ്റ 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi കോൾ വിളിക്കുന്നു റോമിംഗ് ഹാൻഡ്ഓഫ്"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi കോൾ വിളിക്കുന്നു"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ലോഞ്ചർ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"സ്ക്രീൻ ടച്ച്സ്ക്രീൻ"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"മങ്ങിയ സ്‌ക്രീൻ ടച്ച്‌സ്‌ക്രീൻ ബാറ്ററി"</string>
@@ -2393,7 +2389,7 @@
     <string name="keywords_users" msgid="4673901601478559100">"നിയന്ത്രണം നിയന്ത്രിക്കുക നിയന്ത്രിച്ചു"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ടെക്‌സ്‌റ്റ് തിരുത്തൽ തിരുത്തുക ശബ്‌ദം വൈബ്രേറ്റുചെയ്യുക സ്വയമേവയുള്ള ഭഷ സവിശേഷത നിർദ്ദേശിക്കുക നിർദ്ദേശം തീം കുറ്റകരമായ പദം ടൈപ്പുചെയ്യൽ ഇമോജി അന്തർദ്ദേശീയം"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"മുൻഗണനകളെ സ്ഥിരമെന്ന് റീസെറ്റുചെയ്യുക"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"അപ്ലിക്കേഷനുകൾ ഡൗൺലോഡ് അപ്ലിക്കേഷനുകൾ സിസ്റ്റം"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"ആപ്സ് ഡൗൺലോഡ് അപ്ലിക്കേഷൻ സിസ്റ്റം"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"പാസ്‌വേഡ് പാറ്റേൺ പിൻ സ്ലൈഡുചെയ്യുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
@@ -2457,7 +2453,7 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"ഈ അപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"മുൻഗണന എന്ന് കണക്കാക്കുക"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"മുൻഗണയായി കണക്കാക്കുക"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"\'മുൻഗണന മാത്രം\' എന്നതിൽ \'ശല്യപ്പെടുത്തരുത്\' എന്നത് സജ്ജമാക്കുമ്പോൾ, ഈ അപ്ലിക്കേഷന്റെ അറിയിപ്പുകൾ കേൾക്കുന്നതാക്കുക"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"പീക്കിംഗ് അനുവദിക്കുക"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"നിലവിലെ സ്‌ക്രീനിൽ ചില അറിയിപ്പുകളെ കാഴ്‌ച എന്നതിലേക്ക് നീക്കിക്കൊണ്ട് അവയ്‌ക്ക് പ്രാധാന്യം നൽകാൻ ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുക"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"സിസ്റ്റം, ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷനുകൾ എന്നിവ ഉൾപ്പെടെ <xliff:g id="COUNT">%d</xliff:g> അപ്ലിക്കേഷനുകൾ ഇൻസ്റ്റാളുചെയ്‌തു"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 044bc9e..640e655 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Энэ тэмдэг гарч ирсэн тохиолдолд та өөрийн хурууны хээг оруулах эсвэл худалдан авалт хийх зөвшөөрөл олгох боломжтой болох юм."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Нэмэх"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Дараах"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Хурууны хээг тал уншуулсан байна. Дахин оролдоно уу."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Хурууны хээ мэдрэгч бохирдсон байна. Та цэвэрлэсний дараагаар дахин оролдоно уу."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Хурууг уншиж дуусаагүй байхад авсан байна. Та дахин уншуулна уу."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Хурууг хэт удаан уншуулсан байна. Та дахин уншуулна уу."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Мэдээллийг оруулах боломжгүй байна. Дахин оролдоно уу."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Техник хангамж бэлэн бус байна."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Хурууны хээг хадгалах боломжгүй байна. Одоо байгаа хурууны хээг арилгана уу."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Хурууны хээ оруулах хугацаа өнгөрсөн байна. Дахин оруулна уу."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрлэлт"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Таблетыг шифрлэх"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Утсыг шифрлэх"</string>
@@ -741,8 +733,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi илүүд эрхэмлэдэг (Wi-Fi байхгүй тохиолдолд зөвхөн үүрэн сүлжээг ашигладаг)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Үүрэн сүлжээг эрхэмлэх (Үүрэн сүлжээг ашиглах боломжгүй байгаа тохиолдолд зөвхөн Wi-Fi ашигладаг)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Зөвхөн Wi-Fi (Үүрэн сүлжээг огт ашигладаггүй. Wi-Fi байхгүй тохиолдолд дуудлага хийж, хүлээн авах боломжгүй)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Роуминг үйлчилгээ ашиглаж байхад WFC шилжих"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Роуминг үйлчилгээг ашиглаж байхад Wi-Fi дуут ярианаас үүрэн сүлжээнд шилжихийг зөвшөөр"</string>
     <string name="home_settings" msgid="212375129455718176">"Нүүр"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
@@ -1109,10 +1099,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Байршил тодорхойлоход GPS, Wi‑Fi, болон үүрэн сүлжээ ашиглах"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Байршил тодорхойлоход Wi‑Fi болон үүрэн сүлжээ ашиглах"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Байршлыг тогтоохын тулд GPS ашиглах"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скан хийж байна"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скан хийж байна"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; үүрэн сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi-р тодорхойлогдсон байршил"</string>
@@ -1442,10 +1430,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM түгжээ тайлагчийг идэвхжүүлэхийн тулд төхөөрөмжийнхөө пин кодыг оруулна уу."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM түгжээ тайлагчийг зөвшөөрөх үү?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"АНХААР: Энэ тохиргоо асаалттай байгаа үед тухайн төхөөрөмжийн хамгаалалтын функцүүд ажиллахгүй."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Логгерын буферын хэмжээ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Лог буфер бүрт ногдох логгерын хэмжээг сонгоно уу"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Харах тохируулгын шалгалтыг идэвхжүүлэх"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Сүлжээ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose лог-г идэвхжүүлэх"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Үүрэн шилжүүлэг рүү идэвхтэй Wi‑Fi"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi Роум сканыг байнга зөвшөөрөх"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Хуучин DHCP харилцагчийг хэрэглэх"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Утасгүй дэлгэцийн сертификатын сонголтыг харуулах"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi лог-н түвшинг нэмэгдүүлэх, Wi‑Fi Сонгогч дээрх SSID-д ногдох RSSI-г харуулах"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Идэвхжүүлсэн үед Wi‑Fi дохио сул бол дата холболтыг Үүрэн рүү шилжүүлэхдээ илүү идэвхтэй байх болно"</string>
@@ -1457,6 +1452,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Харах тохируулгын шалгалтыг идэвхжүүлэх"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Шинэ Андройд DHCP харилцагчийн оронд Lollipop-ийн DHCP харилцагчийг хэрэглэ."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB дебаг нь зөвхөн хөгжүүлэлтийн зорилготой. Үүнийг өөрийн компьютер болон төхөөрөмжийн хооронд өгөгдөл хуулах, өөрийн төхөөрөмж дээр мэдэгдэлгүйгээр аппликешн суулгах, лог датаг унших зэрэгт ашиглаж болно."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Таны өмнө нь зөвшөөрөл өгсөн бүх компьютерээс USB дебаг хандалтыг нь хураах уу?"</string>
@@ -2357,7 +2353,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сүлжээний холболт"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"Зурвас зурвас бичих зурвасаар харилцах"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"үүрэн холбоо үүрэн зөөгч утасгүй өгөгдөл 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi дуудлаг дуудаж байна роуминг шилжүүлэх"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi дуудлага дуудаж байна"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ажиллуулагч"</string>
     <string name="keywords_display" msgid="6709007669501628320">"дэлгэц мэдрэгчтэй"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"бүдэг дэлгэц мэдрэгчтэй дэлгэц тэжээл"</string>
@@ -2551,4 +2547,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> апп суулгасан байна. Үүнд системийн болон татаж авсан апп-уудыг оруулсан"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 042752e..368437c 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जेव्हाही आपण हे चिन्ह पाहता, तेव्हा आपण ओळखीसाठी किंवा खरेदी अधिकृत करण्यासाठी आपले फिंगरप्रिंट वापरू शकता."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"जोडा"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"पुढील"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"आंशिक फिंगरप्रिंट आढळली. कृपया पुन्हा प्रयत्न करा."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"फिंगरप्रिंट सेन्सर खराब आहे. कृपया साफ करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"बोट लवकर हलविले. कृपया पुन्हा प्रयत्न करा."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"बोट हळू हलविले. कृपया पुन्हा प्रयत्न करा."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"प्रक्रिया करण्यात अयशस्वी. पुन्हा प्रयत्न करा."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"हार्डवेअर उपलब्ध नाही."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"फिंगरप्रिंट संचयित केले जाऊ शकत नाही. कृपया विद्यमान फिंगरप्रिंट काढा."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"फिंगरप्रिंट कालबाह्य झाले. पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"कूटबद्धीकरण"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅब्लेट कूटबद्ध करा"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन कूटबद्ध करा"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"वाय-फाय प्राधान्यकृत (वाय-फाय उपलब्‍ध नसते केवळ तेव्‍हाच सेल नेटवर्क वापरते)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेल्युलर प्राधान्यकृत (सेल नेटवर्क उपलब्‍ध नसते केवळ तेव्हाच वाय-फाय वापरते)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"केवळ वाय-फाय (सेल नेटवर्क कधीही वापरत नाही. वाय-फाय उपलब्ध नसल्यास कॉल करू किंवा प्राप्त करू शकत नाही)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"रोमिंग असताना WFC हँडऑफ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"रोमिंग असताना सेल नेटवर्कवर वाय-फाय व्हॉइस कॉल हँडऑफला अनुमती द्या"</string>
     <string name="home_settings" msgid="212375129455718176">"घर"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शित करा"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
@@ -1450,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलॉक सक्षम करण्यासाठी आपले डिव्हाइस PIN प्रविष्ट करा"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलॉक करण्यास अनुमती द्यायची?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावणी: ही सेटिंग चालू असताना या डिव्हाइसवर डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफर आकार"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफर लॉगर आकार निवडा"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"बनावट स्थानांना अनुमती द्या"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"बनावट स्थानांना अनुमती द्या"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्‍य विशेषता तपासणी सक्षम करा"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किंग"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाय-फाय शब्दपाल्हाळ लॉगिंग सक्षम करा"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेल्‍युलर सोपविण्‍यावरील आक्रमक वाय-फाय"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाय-फाय रोम स्‍कॅनला नेहमी अनुमती द्या"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"परंपरागत DHCP क्लायंटचा वापर करा"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस प्रदर्शन प्रमाणिकरणासाठी पर्याय दर्शवा"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाय-फाय लॉगिंग स्‍तर वाढवा, वाय-फाय निवडकामध्‍ये प्रति SSID RSSI दर्शवा"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"सक्षम केले असताना,  वाय-फाय सिग्‍नल निम्‍न असताना, सेल्‍युलरवरील डेटा कनेक्‍शन वरून वाय-फाय हाताळण्‍यात अधिक आक्रमक असेल"</string>
@@ -1465,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"बनावट स्थानांना अनुमती द्या"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"बनावट स्थानांना अनुमती द्या"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृश्‍य विशेषता तपासणी सक्षम करा"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नवीन Android DHCP क्लायंट ऐवजी Lollipop वरून DHCP क्लायंटचा वापर करा."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करण्यास अनुमती द्यायची?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग करण्याचा हेतू फक्त विकासाच्या उद्देशांसाठी आहे. याचा वापर आपला संगणक आणि आपले डिव्हाइस यांच्या दरम्यान डेटा कॉपी करण्यासाठी करा, सूचनेशिवाय आपल्या डिव्हाइसवर अॅप्स स्थापित करा आणि लॉग डेटा वाचा."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"आपण पूर्वी प्राधिकृत केलेल्या सर्व संगणकांवरुन USB डीबग करण्यासाठी प्रवेश पुनर्प्राप्त करायचा?"</string>
@@ -2365,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"वायफाय वाय-फाय नेटवर्क कनेक्शन"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"मजकूर संदेश मजकूर पाठविणे संदेशन"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेल्युलर सेल कॅरियर वायरलेस डेटा 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"वायफाय वाय-फाय कॉल कॉलिंग रोमिंग हँडऑफ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"वायफाय वाय-फाय कॉल कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लाँचर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रीन स्पर्श स्क्रीन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मंद स्क्रीन टचस्क्रीन बॅटरी"</string>
@@ -2563,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"सिस्टीम आणि डाउनलोड केलेल्या अॅप्ससह, <xliff:g id="COUNT">%d</xliff:g> अॅप्स स्थापित झाले"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3f84f52..a447986 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Apabila anda melihat ikon ini, anda boleh menggunakan cap jari untuk pengenalan atau membenarkan pembelian."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Tambah"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seterusnya"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Cap jari separa dikesan. Sila cuba lagi."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Penderia cap jari kotor. Sila bersihkan dan cuba lagi."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Jari digerakkan terlalu cepat. Sila cuba lagi."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Jari digerakkan terlalu perlahan. Sila cuba lagi."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Tidak dapat memproses. Cuba lagi."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Perkakasan tidak tersedia."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Cap jari tidak dapat disimpan. Sila alih keluar cap jari sedia ada."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tamat masa cap jari dicapai. Cuba lagi."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Sulitkan telefon"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi diutamakan (Menggunakan rangkaian selular hanya jika Wi-Fi tidak tersedia)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Selular diutamakan (Menggunakan Wi-Fi hanya jika rangkaian selular tidak tersedia)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi shj (Jgn gunakan rangkaian sel. Tidak boleh membuat atau menerima panggilan jika Wi-Fi tiada)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Penyerahan WFC semasa merayau"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Benarkan penyerahan panggilan suara Wi-Fi ke rangkaian selular semasa merayau"</string>
     <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gunakan GPS, Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gunakan Wi-Fi dan rangkaian selular untuk menentukan lokasi"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gunakan GPS untuk menentukan lokasi"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Mengimbas"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Mengimbas"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasi Wi-Fi &amp; selular"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Masukkan PIN peranti anda untuk mendayakan buka kunci OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Benarkan pembukaan kunci OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AMARAN: Ciri perlindungan peranti tidak akan berfungsi pada peranti ini semasa tetapan ini dihidupkan."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Saiz penimbal pengelog"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pilih saiz Pengelog per pnmbal log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Dayakan pemeriksaan atribut paparan"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Perangkaian"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Pensijilan paparan wayarles"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Dayakan Pengelogan Berjela-jela Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Penyerahan Wi-Fi ke Selular agresif"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Sentiasa benarkan Imbasan Perayauan Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gunakan pelanggan DHCP lama"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tunjukkan pilihan untuk pensijilan paparan wayarles"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tingkatkan tahap pengelogan Wi-Fi, tunjuk setiap SSID RSSI dalam Pemilih Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Apabila diaktifkan, Wi-Fi akan menjadi lebih agresif dalam menyerahkan sambungan data ke Selular, apabila isyarat Wi-Fi rendah"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Dayakan pemeriksaan atribut paparan"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gunakan pelanggan DHCP daripada Lollipop bukannya pelanggan DHCP Android baharu."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Penyahpepijatan USB adalah dimaksudkan untuk tujuan pembangunan sahaja. Gunakannya untuk menyalin data antara komputer dan peranti anda, memasang aplikasi pada peranti anda tanpa pemberitahuan, dan membaca data log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Batalkan akses ke penyahpepijatan USB dari semua komputer yang anda berikan kebenaran sebelum ini?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sambungan rangkaian"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesej teks menghantar mesej mesej pemesejan"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"selular sel pembawa data wayarles 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi panggilan memanggil perayauan serah"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi panggil panggilan"</string>
     <string name="keywords_home" msgid="3626170808219458848">"pelancar"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrin skrin sentuh"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"skrin malap skrin sentuh bateri"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apl dipasang, termasuk apl sistem dan apl yang dimuat turun"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index f504630..3def204 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ဤကိုယ်စားပြုရုပ်ပုံကို သင်တွေ့တိုင်း၊  သက်သေခံခြင်းအတွက်သို့မဟုတ် ဝယ်ယူခြင်းကို ခွင့်ပြုရန်အတွက် သင့်လက်ဗွေရာကို အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"ထည့်ရန်"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"နောက်တစ်ခု"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"လက်ဗွေရဦ တစ်ပိုင်းတစ်စ တွေ့ရှိသည်။ ကျေးဇူးပြု၍ ထပ်မံကြိုးစားပါ။"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"လက်ဗွေရာဖတ်ကိရိယာ ညစ်ပေနေသည်။ ကျေးဇူးပြု၍ ရှင်းလင်းကာ ထပ်မံကြိုးစားပါ။"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"လက်ရွှေ့လျားခြင်း အလွန်မြန်သည်။ ကျေးဇူးပြု၍ ထပ်မံကြိုးစားပါ။"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"လက်ရွှေ့လျားခြင်း အလွန်နှေးသည်။ ကျေးဇူးပြု၍ ထပ်မံကြိုးစားပါ။"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"လုပ်ဆောင်၍မရပါ။ ထပ်မံကြိုးစားပါ။"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ပစ္စည်းမရနိုင်ပါ။"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"လက်ဗွေရာ သိုလှောင်၍မရပါ။ ကျေးဇူးပြု၍ ရှိပြီးလက်ဗွေရာအား ဖယ်ရှားပါ။"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"လက်ဗွေရာအချိန်ကုန် သွားပါသည်။ ထပ်မံကြိုးစားပါ။"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"လျှို့ဝှက်အသွင်ပြောင်းခြင်း"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"တက်ပလက်ကိုလျှို့ဝှက်အသွင်ပြောင်းရန်"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"လျှို့ဝှက်အသွင်ပြောင်းထားသောဖုန်း"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ဝိုင်ဖိုင်အား ပိုနှစ်သက်သော (ဝိုင်ဖိုင် မရပါက ဆဲလ်ကွန်ယက်ကိုသာလျှင် သုံးရန်)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ဆယ်လူလာအား ပိုနှစ်သက်သော (ဆဲလ်ကွန်ယက် မရပါက ဝိုင်ဖိုင်ကိုသာလျှင် အသုံးပြုရန်)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"ဝိုင်ဖိုင်သာ (ဆဲလ်ကွန်ယက် လုံးဝမသုံးရန်။ ဝိုင်ဖိုင်မရလျှင် ဖုန်းခေါ်ခြင်း သို့ လက်ခံခြင်းမလုပ်နိုင်)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ရုန်းမင်းသုံးစဉ် WFC ပြောင်းလဲ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ရုန်းမင်းသုံးစဉ် အသံဖြင့်ဖုန်းခေါ်ခြင်းများအား ဆဲလ်ကွန်ယက်သို့ပြောင်းပေးရန် ဝိုင်ဖိုင်အား ခွင့်ပြုပါ"</string>
     <string name="home_settings" msgid="212375129455718176">"ပင်မ​စာ​မျက်နှာ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
@@ -1120,10 +1110,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"တည်နေရာကို ဆုံးဖြတ်ရန် ကြိုးမဲ့ နှင့် ဆယ်လူလာ ကွန်ရက်များကို သုံးရန်"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"သေချာစစ်ဆေးနေပါသည်။"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"သေချာစစ်ဆေးနေပါသည်။"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ကြိုးမဲ့ &amp; ဆယ်လူလာ ကွန်ရက် တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို ဂူဂယ်လ်၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ဝိုင်ဖိုင်မှ ဆုံးဖြတ်သော တည်နေရာ"</string>
@@ -1453,10 +1441,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM သော့ဖွင့်ခြင်း အသုံးပြုရန် သင့်ကိရိယာ ပင်နံပါတ်ရိုက်ထည့်ပါ။"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM သော့ဖွင့်ခြင်း ခွင့်ပြုမလား?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"သတိပေးချက်: ဤချိန်ညှိချက်ဖွင့်ထားလျှင်၊ ဤစက်ပစ္စည်းပေါ်တွင် စက်ပစ္စည်းကာကွယ်သည့် အထူးပြုလုပ်ချက် အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"လော့ဂါး ဘာဖား ဆိုက်များ"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"လော့ ဘာဖားတွက် လော့ဂါးဆိုက် ရွေး"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ကွန်ရက်လုပ်ငန်း"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose မှတ်တမ်းတင်ခြင်းအား ဖွင့်မည်"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ထိရောက်သည့် Wi‑Fi မှ ဆယ်လူလာ လွှဲပြောင်းမှု"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi ရွမ်းရှာဖွေမှုကို အမြဲတမ်း ခွင့်ပြုမည်"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"DHCP ကလိုင်းယင့် အဟောင်းအားသုံးရန်"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ကြိုးမဲ့ အခင်းအကျင်း အသိအမှတ်ပြုလက်မှတ်အတွက် ရွေးချယ်စရာများပြရန်"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi မှတ်တမ်းတင်ခြင်း နှုန်းအားမြင့်ကာ၊ Wi‑Fi ရွေးရာတွင် SSID RSSI ဖြင့်ပြပါ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ဖွင့်ထားလျှင်၊ Wi‑Fi မှ ဆယ်လူလာသို့ အချက်လက် ချိတ်ဆက်မှုအား လွှဲပြောင်းရာ၌ ပိုမိုထိရောက်ပါသည်၊ WIFI အားနည်းနေချိန်တွင်"</string>
@@ -1468,6 +1463,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ပုံစံတုတည်နေရာများကို ခွင့်ပြုရန်"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"အရည်အချင်းများ စူးစမ်းမှု မြင်ကွင်းကို ဖွင့်ပေးရန်"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Android DHCP ကလိုင်းယင့် အသစ် အစား Lollipop မှ DHCP ကလိုင်းယင့်အား သုံးပါ။"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB ပြသနာရှာခြင်း ခွင့်ပြုပါမလား?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USBအမှားရှားခြင်းမှာ ဆော့ဝဲလ်ရေးသားရန်အတွက်သာ ရည်ရွယ်ပါသည်။ သင့်ကွန်ပြုတာနှင့်သင့်စက်ကြားတွင် ဒေတာများကိုကူးယူရန်၊ အကြောင်းမကြားပဲနှင့် သင့်စက်အတွင်းသို့ အပလီကေးရှင်းများထည့်သွင်းခြင်းနှင့် ဒေတာမှတ်တမ်းများဖတ်ရန်အတွက် အသုံးပြုပါ"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"သင် ယခင်က ခွင့်ပြုခဲ့သော ကွန်ပျူတာအားလုံးမှ ယူအက်စ်ဘီ အမှားစစ်ခွင့်ကို ရုတ်သိမ်းမည်လား ?"</string>
@@ -2368,7 +2364,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ဝိုင်ဖိုင်ကွန်ရက်ချိတ်ဆက်မှုဖြင့်"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"စာတို စာ စာတိုပို့ခြင်း စာများ စာပို့ခြင်း"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"ဆဲလ်လူလာ ဆဲလ် မိုဘိုင်းဆက်သွယ်ရေးဝန်ဆောင်မှုဌာန ကြိုးမဲ့ ဒေတာ 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"ဝိုင်ဖိုင် ခေါ်ဆိုမှု ကွန်ယက်ပြင်ပဒေတာချိတ်ဆက်ခြင်း အပြောင်းအလဲ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"ဝိုင်ဖိုင် ဝိုင်ဖိုင် ခေါ်ဆိုခြင်း"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ဖွင့်တင်ပေးသူ"</string>
     <string name="keywords_display" msgid="6709007669501628320">"မျက်နှာပြင် တာ့ချမျက်နှာပြင်"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"မြင်ကွင်းမိန်ခြင်း ထိတွေ့မြင်ကွင်း ဘတ်ထရီ"</string>
@@ -2566,4 +2562,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"စနစ် နှင့် ဒေါင်းယူရယူထားသော app များ အပါအဝင်၊ သွင်းယူထားသော app အရေအတွက် <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8930e49..1e4c76c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt som identifikasjon eller til å godkjenne kjøp."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Legg til"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Neste"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Delvis fingeravtrykk registrert. Prøv på nytt."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingeravtrykksensoren er skitten. Rengjør den og prøv på nytt."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Fingeren ble fjernet for raskt. Prøv på nytt."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Fingeren ble fjernet for sakte. Prøv på nytt."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Kunne ikke behandle fingeravtrykket. Prøv på nytt."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Maskinvaren er ikke tilgjengelig."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingeravtrykket kan ikke lagres. Fjern et eksisterende fingeravtrykk."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tidsavbrudd for fingeravtrykk er nådd. Prøv på nytt."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptér nettbrettet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptér telefonen"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi er foretrukket (bruker Wi-Fi bare hvis mobilnettverk ikke er tilgjengelig)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilnettverk er foretrukket (bruker Wi-Fi bare hvis mobilnettverk ikke er tilgjengelig)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Bare Wi-Fi (Bruker aldri mobilnettverk. Kan ikke ringe eller motta anrop hvis Wi-Fi ikke er tilgjengelig)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-overføring ved roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Tillat overføring av Wi-Fi-taleanropp til mobilnettverk ved roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Bruk GPS, Wi-Fi, og mobilnettverk til å fastslå posisjon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Bruk Wi-Fi og mobilnettverk til å fastslå posisjon"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Søker"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søker"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Tast inn enhetens PIN-kode for å aktivere OEM-opplåsing"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vil du tillate OEM-opplåsing?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ADVARSEL: Enhetsbeskyttelse-funksjoner fungerer ikke på denne enheten mens denne innstillingen er slått på."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Bufferstørrelser for logg"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velg Loggstørrelser per loggbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér inspeksjon av visningsattributtet"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Nettverk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktiver detaljert Wi-Fi-loggføring"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv overføring til Wi-Fi for mobil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillat alltid skanning for Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Bruk den eldre versjonen av DHCP-klienten"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis alternativer for trådløs skjerm-sertifisering"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Øk Wi-Fi-loggenivå – vis per SSID RSSI i Wi-Fi-velgeren"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Hvis dette slås på, overfører Wi-Fi-nettverket datatilkoblingen til mobil mer aggressivt når Wi-Fi-signalet er lavt"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivér inspeksjon av visningsattributtet"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Bruk DHCP-klienten fra Lollipop i stedet for den nye DHCP-klienten for Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-feilsøking er bare ment for utviklingsformål. Bruk det til å kopiere data mellom datamaskinen og enheten, installere apper på enheten uten varsel og lese loggdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vil du oppheve tilgangen til USB-feilsøking fra alle datamaskiner du tidligere har autorisert?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sende melding sende tekstmelding meldinger"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatør trådløs data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ringe ringer roaming håndfri"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi ringe ringer"</string>
     <string name="keywords_home" msgid="3626170808219458848">"appoversikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"berøringsskjerm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimme skjerm berøringsskjerm batteri"</string>
@@ -2375,7 +2371,7 @@
     <string name="keywords_display_night_mode" msgid="7652025075378505346">"mørkt tema nattmodus ton ned skjermen inverter lysstyrken"</string>
     <string name="keywords_display_wallpaper" msgid="7778443098569037063">"bakgrunn gi personlig preg tilpass skjermen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekststørrelse"</string>
-    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projiser cast"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projiser casting"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"plass disk harddisk enhetsbruk"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"strømforbruk lade"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"stavemåte ordliste stavekontroll autokorrektur"</string>
@@ -2459,7 +2455,7 @@
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Vis aldri varsler fra denne appen"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Behandle som prioritert"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Ikke kutt lyden for varsler fra denne appen når «Ikke forstyrr» er angitt som «Bare prioriterte»"</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillat titting"</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Tillat smugtitting"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"La denne appen legge vekt på bestemte varsler ved å vise dem kjapt på skjermen"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skjul sensitivt innhold"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Når enheten er låst, skjules innhold i denne appens varsler som kan avsløre privat informasjon"</string>
@@ -2561,8 +2557,9 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokkert"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Prioritert"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Sensitivt"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Tilbakestill innstillingene for alle appene til standardinnstillingene"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Tilbakestill innstillingene for alle apper til standardinnstillingene"</string>
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apper er installert, inkludert systemapper og nedlastede apper"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index e1d037e..f0f81ed 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -339,7 +339,7 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"पासवर्डहरू"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"औंठाछाप"</string>
-    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"औंठाछापहरू प्रबन्ध गर्नुहोस्"</string>
+    <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
     <string name="fingerprint_add_title" msgid="3453670509485083962">"थप्नुहोस्"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"स्क्रिन लक"</string>
@@ -348,7 +348,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> औठाछाप नामाङ्कन गरियो</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"औँठाछाप सेटअप"</string>
-    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"खरिद पुष्टि गर्न वा तपाईँको स्क्रिन अनलक गर्न तपाईँको औँठा छाप प्रयोग गर्न, हामीलाई : \n\n ✓ तपाईँको ब्याकअप स्क्रिन लक विधि गर्नुहोस् \n\n आवश्यक पर्छ ✓ तपाईँको औँठाछाप थप्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"खरिद पुष्टि गर्न वा तपाईँको स्क्रिन अनलक गर्न तपाईँको औँठा छाप प्रयोग गर्न, हामीलाई : \n\n ✓ तपाईँको जगेडा स्क्रिन लक विधि गर्नुहोस् \n\n आवश्यक पर्छ ✓ तपाईँको औँठाछाप थप्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर खोज्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"तपाईँको फोनको पछाडि तर्फ औठाछाप सेन्सरको स्थान निर्धारण गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"तपाईं यस आइकन जहिले देख्नुहुन्छ, तपाईं पहिचानको लागि वा एक खरीद अधिकारको निम्ति आफ्नो औठाछाप प्रयोग गर्न सक्नुहुन्छ।"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"थप्नुहोस्"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"अर्को"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"आंशिक औठाछाप पत्ता लाग्यो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"औँठाछाप सेन्सर फोहोर छ। कृपया सफा गरेर फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"औंला निकै छिटो सारियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"औंला निकै ढिला सारियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"प्रसोधन गर्न असमर्थ। फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"हार्डवेयर उपलब्ध छैन।"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"औँठाछाप भण्डारण गर्न सकिँदैन। कृपया अवस्थित औठाछाप हटाउनुहोस्।"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"औँठाछापको समय सकिएको छ। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्क्रिप्सन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"इन्क्रिप्ट ट्याब्लेट"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन इन्क्रिप्ट गर्नुहोस्"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi को सुझाव गरियो (Wi-Fi उपलब्ध नहुँदा मात्र सेल सञ्जालको प्रयोग गर्दछ)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेलुलरको सुझाव गरियो (सेल सञ्जाल उपलब्ध नहुँदा मात्र Wi-Fi को प्रयोग गर्दछ)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi मात्र (सेल सञ्जालको कहिल्यै प्रयोग गर्दैन। Wi-Fi उपलब्ध नहुँदा कलहरू गर्न वा प्राप्त गर्न सकिँदैन)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"रोमिङको बेलामा WFC ह्यान्डअफ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"रोमिङको बेलामा सेल सञ्जालमा Wi-Fi आवाज कल ह्यान्डअफलाई अनुमति दिनुहोस्"</string>
     <string name="home_settings" msgid="212375129455718176">"गृह"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
@@ -1450,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM अनलक सक्षम गर्न तपाईँको उपकरणको PIN प्रविष्ट गर्नुहोस्"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM अनलक गर्न अनुमति दिने?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"चेतावनी: यो सेटिङ खुला हुँदा, यस उपकरणमा उपकरण सुरक्षा सुविधाहरूले काम गर्ने छैनन्।"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"लगर बफर आकारहरू"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"लग बफर प्रति लगर आकार चयन गर्नुहोस्"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"सञ्जाल निर्माण"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ताररहित प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाइफाइ वर्बोज लग सक्षम पार्नुहोस्"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक वाइफाइ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाइफाइ घुम्ने स्क्यान गर्न सधैँ अनुमति दिनुहोस्"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"पैतृक DHCP ग्राहक प्रयोग गर्नुहोस्"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ताररहित प्रदर्शन प्रमाणीकरणका लागि विकल्पहरू देखाउनुहोस्"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाइफाइ लग स्तर बढाउनुहोस्, वाइफाइ चयनकर्तामा प्रति SSID RSSI देखाइन्छ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"वाइफाइ संकेत कम हुँदा, सक्षम जब गरिन्छ, वाइफाइ सेलुलर लागि डेटा जडान सुम्पनामा बढी आक्रामक हुनेछ"</string>
@@ -1465,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"नयाँ Android DHCP ग्राहकको सट्टा Lollipop बाट DHCP ग्राहक प्रयोग गर्नुहोस्।"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डिबग गर्न लागि अनुमति दिने हो?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"युएसबी डिबगिङ विकास प्रयोजनका लागि मात्र निर्मित हुन्छ। यसलाई तपाईँको कम्प्युटर र तपाईँको उपकरणका बीच डेटा प्रतिलिपि गर्न, बिना सूचना तपाईँको उपकरणमा अनुप्रयोगहरू स्थापना गर्न र लग डेटा पढ्नका लागि प्रयोग गर्नुहोस्।"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"तपाईँ पहिले नै अधिकृत गर्नुभएका सबै कम्प्यूटरबाट USB डिबग गर्नको लागि पहुँच रद्द गर्ने हो?"</string>
@@ -2365,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi सञ्जाल जडान"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"पाठ सन्देश पाठ सन्देशिकरण सन्देश पठाउदै"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"सेलुलर सेल वाहक वायरलेस डेटा ४जी ३जी २जी lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi कल कलिङ रोमिङ ह्यान्डअफ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi कल कलिङ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लन्चर"</string>
     <string name="keywords_display" msgid="6709007669501628320">"स्क्रिन टचस्क्रिन"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"मधुरो स्क्रिन छोएर चल्ने स्क्रिन ब्याट्री"</string>
@@ -2391,7 +2389,7 @@
     <string name="keywords_users" msgid="4673901601478559100">"प्रतिबन्ध सीमित सीमित गरिएको"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव दिनु सुझाव विषय आपत्तिजनक शब्द प्रकार इमोजी अन्तर्राष्ट्रिय"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राथमिकताहरू पूर्वनिर्धारित रिसेट गर्नुहोस्"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड अनुप्रयोगहरू प्रणाली"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड गर्ने अनुप्रयोग प्रणाली"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"पासवर्ड प्याटर्न पिन स्लाइड गर्नुहोस्"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
@@ -2458,7 +2456,7 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"प्राथमिकताको रूपमा व्यवहार गर्नुहोस्"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"प्राथमिकतामा मात्र बाधा नगर्नुहोस् भन्ने सेट भएको बेला यो अनुप्रयोगका सूचनाहरू सुनिने पार्न अनुमति दिनुहोस्"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"हेर्न अनुमति दिनुहोस्"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"यो अनुप्रयोगलाई हालको स्क्रिनमा दृश्यमा हल्कसँग तिनीहरूलाई स्लाइड गरेर खास सूचनाहरूलाई जोड गर्न अनुमति दिनुहोस्"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"हालको स्क्रिनमा दृश्यका लागि हल्का स्लाइड गरेर  यो अनुप्रयोगले निश्चित सूचनाहरूलाई महत्त्व दिने व्यवस्था मिलाउनुहोस्"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"संवेदनशील सामग्री लुकाउनुहोस्"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"यन्त्र लक भएको बेलामा यो अनुप्रयोगको सूचनाहरूमा निजी जानकारी प्रकट गर्ने सामाग्री लुकाउनुहोस्"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरूद्ध गरियो"</string>
@@ -2553,7 +2551,7 @@
     <string name="launch_defaults_some" msgid="313159469856372621">"केही पूर्वनिर्धारितहरू सेट गरिएका छन्"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"कुनै पूर्वनिर्धारित सेट गरिएको छैन"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सबै अनुप्रयोगहरू"</string>
-    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्रिय गरियो"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"सक्षम गरियो"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"रोकियो"</string>
@@ -2563,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"प्रणाली र डाउनलोड गरिएका अनुप्रयोगहरूसहित <xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरू स्थापना गरिए"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 96bc0eb..aa279da 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Wanneer u dit pictogram ziet, kunt u uw vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Toevoegen"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Volgende"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Gedeeltelijke vingerafdruk gedetecteerd. Probeer het opnieuw."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"De vingerafdruksensor moet worden schoongemaakt. Probeer het daarna opnieuw."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Vinger te snel bewogen. Probeer het opnieuw."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Vinger te langzaam bewogen. Probeer het opnieuw."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Kan niet verwerken. Probeer het opnieuw."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware niet beschikbaar."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Vingerafdruk kan niet worden opgeslagen. Verwijder een bestaande vingerafdruk."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Time-out bereikt voor vingerafdruk. Probeer het opnieuw."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Voorkeur voor wifi (mobiel netwerk wordt alleen gebruikt als er geen wifi beschikbaar is)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Voorkeur voor mobiel (wifi wordt alleen gebruikt als er geen mobiel netwerk beschikbaar is)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Alleen wifi (mobiel netwerk wordt nooit gebruikt; kan niet bellen of gebeld worden als er geen wifi beschikbaar is)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-overdracht bij roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Overdracht van wifi-spraakoproepen naar mobiel netwerk toestaan bij roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Startpagina"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"GPS, wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Wifi en mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS gebruiken om locatie te bepalen"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scannen"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scannen"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Locatie via wifi en mob. netw."</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Geef de pincode van uw apparaat op om OEM-ontgrendeling in te schakelen"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM-ontgrendeling toestaan?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WAARSCHUWING: De apparaatbeveiligingsfuncties werken niet op dit apparaat wanneer deze instelling is ingeschakeld."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-buffergrootten"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies Logger-grootten per logbuffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Inspectie van weergavekenmerk inschakelen"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Netwerken"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering van draadloze weergave"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Uitgebreide wifi-logregistratie insch."</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agressieve handover van wifi naar mobiel"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Altijd roamingscans voor wifi toestaan"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Oude DHCP-client gebruiken"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Opties weergeven voor certificering van draadloze weergave"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Logniveau voor wifi verhogen, weergeven per SSID RSSI in wifi-kiezer"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Indien ingeschakeld, is wifi agressiever bij het overgeven van de gegevensverbinding aan mobiel wanneer het wifi-signaal zwak is"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Inspectie van weergavekenmerk inschakelen"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"De DHCP-client van Lollipop gebruiken in plaats van de nieuwe Android DHCP-client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-foutopsporing is alleen bedoeld voor ontwikkeldoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, apps zonder melding op uw apparaat te installeren en loggegevens te lezen."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Toegang tot USB-foutopsporing intrekken voor alle computers waarvoor u dit eerder heeft toegestaan?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netwerk verbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tekst bericht tekstbericht sms sms\'en berichten verzenden sturen"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiel gsm provider draadloos gegevens 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi oproep bellen roaming overdracht"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi oproep bellen"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"scherm touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"dimmen scherm touchscreen accu"</string>
@@ -2375,7 +2371,7 @@
     <string name="keywords_display_night_mode" msgid="7652025075378505346">"donker thema nachtmodus scherm dimmen helderheid omkeren"</string>
     <string name="keywords_display_wallpaper" msgid="7778443098569037063">"achtergrond personaliseren aanpassen weergave"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
-    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"project casten"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"projecteren casten"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"ruimte schijf harde schijf apparaat gebruik"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"stroomverbruik opladen"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"spelling woordenboek spellingcontrole automatisch corrigeren"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps geïnstalleerd, inclusief systeemapps en gedownloade apps"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d71182f..0447c47 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Gdy wyświetla się ta ikona, możesz użyć odcisku palca na potrzeby identyfikacji lub autoryzacji zakupu."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalej"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Odcisk palca został odczytany tylko częściowo. Spróbuj ponownie."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Czytnik linii papilarnych jest zabrudzony. Wyczyść go i spróbuj ponownie."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Palec został uniesiony zbyt szybko. Spróbuj ponownie."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Palec został przesunięty zbyt wolno. Spróbuj ponownie."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Nie można przetworzyć. Spróbuj ponownie."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Czytnik jest niedostępny."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Nie można zapisać odcisku palca. Usuń istniejący odcisk palca."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Osiągnięto limit czasu odczytu linii papilarnych. Spróbuj ponownie."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferuj sieć Wi-Fi (używa sieci komórkowej tylko wtedy, gdy sieć Wi-Fi jest niedostępna)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferuj sieć komórkową (używa Wi-Fi tylko wtedy, gdy sieć komórkowa jest niedostępna)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tylko Wi-Fi (nie używa sieci komórkowej – bez Wi-Fi nie można wykonywać ani odbierać połączeń)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Przełącz z Wi-Fi w roamingu"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Zezwalaj na przełączanie poł. głosowych Wi-Fi na sieć komórkową podczas roamingu"</string>
     <string name="home_settings" msgid="212375129455718176">"Ekran główny"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Określaj lokalizację przez GPS, Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Określaj lokalizację przez Wi-Fi i sieci komórkowe"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Określaj lokalizację przez GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Skanowanie"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skanowanie"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Sieć komórkowa i Wi-Fi"</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>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Aby włączyć zdjęcie blokady OEM, wpisz kod PIN urządzenia"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Zezwolić na zdjęcie blokady OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UWAGA: gdy to ustawienie jest włączone, na urządzeniu nie będą działać funkcje ochrony."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Rozmiary bufora Rejestratora"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Wybierz rozmiary Rejestratora/bufor dziennika"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Włącz inspekcję wyśw. atrybutu"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Sieci"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Włącz szczegółowe rejestrowanie Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresywne przeł. Wi‑Fi na sieć kom."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Zawsze zezwalaj na skanowanie w celu roamingu Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Użyj starszego klienta DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaż opcje certyfikacji wyświetlacza bezprzewodowego"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zwiększ poziom rejestrowania Wi‑Fi, pokaż według RSSI SSID w selektorze Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Po włączeniu połączenie danych będzie bardziej agresywnie przełączać się z Wi-Fi na sieć komórkową przy słabym sygnale Wi-Fi"</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Włącz inspekcję wyśw. atrybutu"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Użyj klienta DHCP z Lollipop zamiast nowego klienta DHCP Androida."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Debugowanie USB jest przeznaczone wyłącznie do celów programistycznych. Może służyć do kopiowania danych między komputerem a urządzeniem, instalowania aplikacji na urządzeniu bez powiadamiania, a także odczytu danych dziennika."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Odwołać dostęp wszystkich poprzednio autoryzowanych komputerów do debugowania USB?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi połączenie internet"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"SMS pisanie SMS-ów wiadomości SMS-owanie"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"komórkowy komórka operator bezprzewodowe dane 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi rozmowa połączenie roaming przełączanie"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi dzwonić połączenie rozmowa"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dotykowy"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"przyciemnij ekran ekran dotykowy bateria"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Zainstalowane aplikacje: <xliff:g id="COUNT">%d</xliff:g>, w tym systemowe i pobrane"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index be3d1e9..e51bf12 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar uma compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adicionar"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Impressão digital detetada. Tente novamente."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"O sensor de impressões digitais está sujo. Limpe-o e tente novamente."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"O dedo moveu-se demasiado rápido. Tente novamente."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"O dedo moveu-se demasiado devagar. Tente novamente."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Não é possível processar. Tente novamente."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware não disponível."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Não é possível armazenar a impressão digital. Remova uma impressão digital existente."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Foi atingido o limite de tempo da impressão digital. Tente novamente."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar telefone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Rede Wi-Fi preferida (utiliza apenas a rede celular se o Wi-Fi não estiver disponível)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Rede móvel preferida (utiliza Wi-Fi apenas se a rede celular não estiver disponível)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Apenas Wi-Fi (nunca utiliza rede celular. N/ pode fazer/receber chamadas se Wi-Fi não estiver disp.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transferência WFC em roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permitir transferência de chamadas de voz Wi-Fi para rede celular em roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Página Inicial"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizar redes móveis, Wi-Fi e GPS para determinar localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizar redes móveis e Wi-Fi para determinar localização"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilizar o GPS para determinar a localização"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"A analisar"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi e localiz. de rede mó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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduza o PIN do dispositivo para ativar o desbloqueio do OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Pretende permitir o desbloqueio de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: as funcionalidades de proteção do dispositivo não funcionam neste dispositivo enquanto esta definição estiver ativada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos da memória intermédia do registo"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selec. tam. reg. p/ mem. int. reg."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar a inspeção do atributo de visualização"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de display sem fios"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar o registo verboso de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transm. agressiva de Wi-Fi p/ rede móvel"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Permitir sempre a deteção de Wi-Fi em roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Utilizar cliente DHCP antigo"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções da certificação de display sem fios"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nível de reg. de Wi-Fi, mostrar por RSSI de SSID no Selec. de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Se estiver ativado, o Wi-Fi será mais agressivo ao transmitir a lig. de dados p/ a rede móvel quando o sinal Wi-Fi estiver fraco"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar a inspeção do atributo de visualização"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Utilizar o cliente DHCP do Lollipop em vez do novo cliente DHCP do Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB é utilizada apenas para fins de programação. Utilize-a para copiar dados entre o computador e o aparelho, instalar aplicações no aparelho sem notificação e ler dados de registo."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revogar acesso à depuração USB de todos os computadores anteriormente autorizados?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ligação a rede Wi-Fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto mensagens de texto mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"telemóvel operador de telemóvel dados sem fios 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi chamada telefonar roaming transferir"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi telefonar chamadas"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecrã tátil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"esbater ecrã ecrã tátil bateria"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicações instaladas, incluindo aplicações do sistema e transferidas"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 661a1ca..c92a901 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Sempre que esse ícone é exibido, você pode usar sua impressão digital para fins de identificação ou para autorizar uma compra."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adicionar"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próximo"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Impressão digital parcial detectada. Tente novamente."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"O sensor de impressão digital está sujo. Limpe-o e tente novamente."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"O dedo foi retirado rápido demais. Tente novamente."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"O movimento do dedo está muito lento. Tente novamente."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Não foi possível concluir o processamento. Tente novamente."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware indisponível."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Não foi possível armazenar a impressão digital. Remova uma impressão digital já existente."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tempo máximo para captura da impressão digital atingido. Tente novamente."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferido: usa a rede celular apenas se o Wi-Fi não está disponível"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Celular preferido: usa o Wi-Fi apenas se a rede celular não está disponível"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi apenas: nunca usa rede celular. Não faz nem recebe chamadas se o Wi-Fi não está disponível"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transf. WFC durante roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permite transferência de chamada de voz Wi-Fi para rede celular durante roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Usar GPS, Wi‑Fi e redes celulares para determinar a localização"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Usar Wi-Fi e redes celulares para determinar a localização"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Verificação"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Localiz. por Wi-Fi e rede cel."</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que apps 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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Digite o PIN do dispositivo para ativar o desbloqueio de OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permitir desbloqueio de OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVISO: os recursos de proteção do dispositivo não funcionarão neste dispositivo enquanto esta configuração estiver desativada."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos de buffer de logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tam. de logger/buffer de log"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Redes"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de Display sem fio"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Ativar registro extenso de Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Transf. agressiva de Wi-Fi para celular"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Sempre permitir verif. de roaming de Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Usar cliente DHCP legado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções de certificação de Display sem fio"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Aumentar o nível de registro do Wi-Fi; mostrar conforme o RSSI de SSID na Seleção de Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Quando ativada, o Wi-Fi será mais agressivo em transferir a conexão de dados para celular, quando o sinal de Wi-Fi estiver fraco"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Ativar visualiz. insp. atributo"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Use o cliente DHCP do Lollipop, em vez do novo cliente DHCP do Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"A depuração USB serve apenas para fins de desenvolvimento. Use-a para copiar dados entre o computador e o dispositivo, instalar apps no seu aparelho sem notificação e ler dados de registro."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revogar o acesso à depuração USB para todos os computadores autorizados?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexão"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mensagem de texto enviar mensagens de texto mensagens mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular operadora de celular dados sem fio 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi chamada chamando roaming transferência"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi chamada chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"tela de início"</string>
     <string name="keywords_display" msgid="6709007669501628320">"tela touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"escurecer tela touchscreen bateria"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps instalados, incluindo o sistema e apps baixados"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 275c10a..ff78b04 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"De fiecare dată când vedeți această pictogramă vă puteți folosi amprenta pentru autentificare sau pentru a autoriza o achiziție."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Adăugați"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Înainte"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"S-a detectat parțial amprenta. Încercați din nou."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Senzorul pentru amprente este murdar. Curățați-l și încercați din nou."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Ați mișcat degetul prea repede. Încercați din nou."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Ați mișcat degetul prea încet. Încercați din nou."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Nu se poate procesa. Încercați din nou."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardware-ul nu este disponibil."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Amprenta nu poate fi stocată. Eliminați o amprentă existentă."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Timpul pentru amprentare a expirat. Încercați din nou."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi telefonul"</string>
@@ -759,8 +751,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Se preferă Wi-Fi (Folosește rețeaua mobilă numai când conexiunea Wi-Fi nu e disponibilă)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Se preferă conexiunea mobilă (Folosește Wi-Fi numai când rețeaua mobilă nu e disponibilă)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Numai Wi-Fi (Nu folosește niciodată rețeaua mobilă. Nu se pot efectua sau primi apeluri fără Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Transfer WFC în roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Permite transferul apelurilor vocale prin Wi-Fi către rețeaua mobilă în roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
@@ -1128,10 +1118,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Utilizează GPS, Wi-Fi și rețelele mobile pentru determinarea locației"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Utilizează rețelele Wi-Fi și mobile pentru determinarea locației"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Folosiți GPS-ul pentru a stabili locația"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Scanare"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanare"</string>
     <string name="location_network_based" msgid="6010456018401296590">"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>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
@@ -1462,10 +1450,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Introduceți codul PIN al dispozitivului pentru a activa deblocarea OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Permiteți deblocarea OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"AVERTISMENT: funcțiile de protecție a dispozitivului nu vor funcționa pe acest dispozitiv cât timp setarea este activată."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensiunile tamponului Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. dimens. Logger/tampon jurnal"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Activați inspectarea atributelor de vizualizare"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Conectare la rețele"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Act. înr. prin Wi-Fi a vol. mari de date"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Înlocuire Wi-Fi cu mobil agresivă"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Se permite întotdeauna scanarea traficului Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Folosiți vechiul client DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afișați opțiunile pentru certificarea Ecran wireless"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Măriți niv. de înr. prin Wi‑Fi, afișați în fcț. de SSID RSSI în Selectorul Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Când este activată, funcția Wi-Fi va fi mai agresivă la predarea conexiunii de date către mobil când semnalul Wi-Fi este slab"</string>
@@ -1477,6 +1472,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Activați inspectarea atributelor de vizualizare"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Folosiți clientul DHCP din Lollipop în locul noului client Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Depanarea USB are exclusiv scopuri de dezvoltare. Utilizaţi-o pentru a copia date de pe computer pe dispozitiv, pentru a instala aplicații pe dispozitiv fără notificare și pentru a citi datele din jurnale."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revocați accesul la remedierea erorilor prin USB de pe toate computerele pe care le-ați autorizat anterior?"</string>
@@ -2377,7 +2373,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi conexiune la rețea"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"mesaj text trimitere de SMS-uri mesaje text trimitere de mesaje"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"celular furnizor de servicii celulare date wireless 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi apel apelare roaming transfer"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi apel apelare"</string>
     <string name="keywords_home" msgid="3626170808219458848">"lansator"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ecran tactil"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"reduceți luminozitatea ecranului ecran tactil baterie"</string>
@@ -2470,7 +2466,7 @@
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nu afișați notificări de la această aplicație"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Tratați ca având prioritate"</string>
-    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permiteți ca notificările acestei aplicații să se audă când opțiunea Nu deranjați este setată la Numai cu prioritate"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Permiteți ca notificările acestei aplicații să se audă când opțiunea Nu deranja este setată la Numai cu prioritate"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Permiteți afișarea de scurtă durată"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"Permiteți ca această aplicație să evidențieze anumite notificări glisându-le pentru scurt timp la vedere pe ecranul actual"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ascundeți conținutul confidențial"</string>
@@ -2578,4 +2574,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (de) aplicații instalate, inclusiv aplicațiile de sistem și descărcate"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index ddb256a..0935119 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -69,12 +69,12 @@
     <item msgid="6041212618892492920">"Очень медленная"</item>
     <item msgid="2361722960903353554">"Медленная"</item>
     <item msgid="1145554631248513562">"Обычная"</item>
-    <item msgid="7553665153391107454">"Быстрая"</item>
-    <item msgid="1370673569131070146">"Беглая"</item>
-    <item msgid="4648206845228970803">"Достаточно быстрая"</item>
-    <item msgid="4977949754169483251">"Быстрая"</item>
-    <item msgid="6106302964845503577">"Ещё быстрее"</item>
-    <item msgid="6800277205640837264">"Очень быстрая"</item>
+    <item msgid="7553665153391107454">"Умеренно быстрая"</item>
+    <item msgid="1370673569131070146">"Быстрая"</item>
+    <item msgid="4648206845228970803">"Очень быстрая"</item>
+    <item msgid="4977949754169483251">"Ускоренная"</item>
+    <item msgid="6106302964845503577">"Сильно ускоренная"</item>
+    <item msgid="6800277205640837264">"Максимальная"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Очень низкий"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9ce28f8..632aeab 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -352,8 +352,7 @@
       <item quantity="other">Отсканировано <xliff:g id="COUNT_1">%1$d</xliff:g> отпечатка</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Добавление отпечатка"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (1892198885652894680) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Чтобы разблокировать экран и подтверждать покупки с помощью сканера: \n\n✓ настройте дополнительный способ блокировки экрана; \n\n✓ сохраните отпечаток своего пальца."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Найдите сканер"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Найдите сканер отпечатков пальцев на задней поверхности телефона."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Название"</string>
@@ -367,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Этот значок сообщает, что вы можете подтверждать покупки и проходить индентификацию с помощью отпечатка пальца."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Добавить"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далее"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Отсканирована только часть пальца. Повторите попытку."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Очистите сканер отпечатков пальцев и повторите попытку."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Вы слишком быстро убрали палец. Повторите попытку."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Вы слишком долго удерживали палец. Повторите попытку."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Не удалось распознать отпечаток. Повторите попытку."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Сканер отпечатков пальцев недоступен"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Нельзя сохранить отпечаток. Удалите существующий."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Превышено время ожидания. Повторите попытку."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрование"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать данные"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать данные"</string>
@@ -768,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Приоритет у Wi-Fi (использовать мобильную сеть, только если сети Wi-Fi недоступны)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Приоритет у моб. сети (использовать Wi-Fi, только если мобильная сеть недоступна)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Только Wi-Fi (без Wi-Fi нельзя звонить и принимать звонки, даже если мобильная сеть доступна)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Переадресация в роуминге"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Разрешить использовать мобильную сеть для приема Wi-Fi-звонков в роуминге"</string>
     <string name="home_settings" msgid="212375129455718176">"Домашний экран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1138,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Использовать GPS, Wi‑Fi и мобильные сети для определения местоположения"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Использовать Wi‑Fi и мобильные сети для определения местоположения"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Поиск"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Поиск"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi и мобильные сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1471,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Введите PIN-код устройства, чтобы разрешить заводскую разблокировку"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Разрешить заводскую разблокировку?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ВНИМАНИЕ! Функции защиты не будут работать на устройстве, пока включен этот параметр."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Размер буфера журнала"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберите размер буфера журнала"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Включить проверку атрибутов"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Сети"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Подробный журнал Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Переключаться на мобильную сеть"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Всегда включать поиск сетей Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Использовать устаревший DHCP-клиент"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показывать параметры сертификации беспроводных мониторов"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"При выборе Wi‑Fi указывать в журнале RSSI для каждого SSID"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Принудительно переключаться на мобильную сеть, если сигнал Wi-Fi слабый"</string>
@@ -1486,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Включить проверку атрибутов"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Использовать DHCP-клиент для Android 5.0, а не для новой версии."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Запретить доступ для USB-отладки на всех компьютерах, на которых вы входили в аккаунт?"</string>
@@ -2386,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сетевое подключение"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст сообщение отправка текстовый SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобильный сотовый беспроводной оператор 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi вызов звонки роуминг переадресация"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi вызов звонок"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Google Старт"</string>
     <string name="keywords_display" msgid="6709007669501628320">"экран сенсорный экран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"яркость сенсорный экран батарея"</string>
@@ -2394,7 +2389,7 @@
     <string name="keywords_display_night_mode" msgid="7652025075378505346">"темное оформление ночной режим затемнение экрана инверсия"</string>
     <string name="keywords_display_wallpaper" msgid="7778443098569037063">"фон настройка пользовательский дисплей"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"размер шрифта"</string>
-    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"трансляция проекта"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"трансляция экрана"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"пространство диск жесткий устройство использование"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"электропитание расход зарядка"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"правописание проверка словарь автозамена"</string>
@@ -2411,10 +2406,8 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
     <string name="keywords_users" msgid="4673901601478559100">"ограничение ограничить ограничено"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправление автокоррекция звук вибрация авто язык жест подсказка тема неприемлемый слово ввод эмодзи смайлик интернациональный"</string>
-    <!-- no translation found for keywords_reset_apps (6420313678620788457) -->
-    <skip />
-    <!-- no translation found for keywords_all_apps (5377153522551809915) -->
-    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"сброс настройки по умолчанию"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"приложения скачать установить система"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем по экрану пароль графический ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
@@ -2482,12 +2475,12 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Не показывать уведомления из этого приложения"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Отметить оповещения как важные"</string>
-    <string name="app_notification_priority_summary" msgid="242979561927455238">"Разрешить приложению отправлять звуковые оповещения в режиме \"Не беспокоить\""</string>
-    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Показывать оповещения"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Разрешить приложению ненадолго выводить некоторые оповещения на текущий экран"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Считать уведомления важными"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"Разрешить звуковые уведомления от этого приложения в режиме оповещения \"Важные\""</string>
+    <string name="app_notification_peekable_title" msgid="8647856880382324822">"Разрешить краткие уведомления"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Разрешить приложению ненадолго выводить некоторые уведомления на текущий экран"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Скрыть конфиденциальные данные"</string>
-    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Не показывать конфиденциальные данные в оповещениях этого приложения, когда устройство заблокировано"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Не показывать конфиденциальные данные в уведомлениях этого приложения, когда устройство заблокировано"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблокированные"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Важные"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфиденциальные"</string>
@@ -2581,25 +2574,16 @@
     </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"Установлены некоторые настройки по умолчанию"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"Настройки по умолчанию не установлены"</string>
-    <!-- no translation found for filter_all_apps (1988403195820688644) -->
-    <skip />
-    <!-- no translation found for filter_enabled_apps (3318021007093070639) -->
-    <skip />
-    <!-- no translation found for filter_personal_apps (3277727374174355971) -->
-    <skip />
-    <!-- no translation found for filter_work_apps (24519936790795574) -->
-    <skip />
-    <!-- no translation found for filter_notif_blocked_apps (3446926933792244485) -->
-    <skip />
-    <!-- no translation found for filter_notif_priority_apps (5965001885749195239) -->
-    <skip />
-    <!-- no translation found for filter_notif_sensitive_apps (412490487743581673) -->
-    <skip />
-    <!-- no translation found for reset_app_preferences_description (7718912868244058770) -->
-    <skip />
-    <!-- no translation found for all_apps_summary (3754827293203127282) -->
-    <skip />
-    <!-- no translation found for advanced_apps (4812975097124803873) -->
-    <skip />
+    <string name="filter_all_apps" msgid="1988403195820688644">"Все приложения"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"Активные"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблокированные"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"Важные"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"Конфиденциальные"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"Восстановить настройки по умолчанию для всех приложений"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Всего приложений: <xliff:g id="COUNT">%d</xliff:g> (включая системные и установленные пользователем)"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 4aba3b5..3f3a24b 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -348,8 +348,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ඇඟිලි සලකුණු ලියාපදිංචි කරන ලදි</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"ඇඟිලි සලකුණු පිහිටුවීම"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (1892198885652894680) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"ඔබේ තිරය අගුළු හැරීමට හෝ මිලදී ගැනීම් තහවුරු කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට, අපට පහත ඒවා කිරීම අවශ්‍ය වේ: \n\n✓ ඔබේ උපස්ථ තිර අගුළු ක්‍රමය පිහිටුවීම \n\n✓ ඔබේ ඇඟිලි සලකුණ එක් කිරීම"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"සංවේදකය සොයන්න"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය ස්ථානගත කරන්න."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"නම‍"</string>
@@ -363,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"මෙම නිරූපකය ඔබ දුටු විට, ඔබව හඳුනා ගැනීම සඳහා හෝ මිලදි ගැනීමක් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණු යොදා ගත හැක."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"එකතු කරන්න"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"මීළඟ"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ඇඟිලි සලකුණ අඩක් පමණක් සංවේදනය විය. කරුණාකර නැවත උත්සාහ කරන්න."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"ඇඟිලි සලකුණු සංවේදකය අපිරිසිදුයි. පිරිසිදු කොට, නැවත උත්සාහ කරන්න."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"ඇඟිල්ල වේගයෙන් ගෙනයන ලදි. කරුණාකර නැවත උත්සාහ කරන්න."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"ඇඟිල්ල සෙමින් ගෙනයන ලදි. කරුණාකර නැවත උත්සාහ කරන්න."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ක්‍රියාවලිය සම්පූර්ණ කිරීමට නොහැක. නැවත උත්සාහ කරන්න."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"දෘඩාංගය නොමැත."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ඇඟිලි සලකුණ ගබඩා කළ නොහැක. දැනට පවතින ඇඟිලි සලකුණු ඉවත් කරන්න."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"ඇඟිලි සලකුණ සලකුණු කාලසීමාව ඉකුත්විය. නැවත උත්සාහ කරන්න."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"සංකේතනය"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"කේතන වගුව"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"දුරකථනය සංකේතනය කිරීම"</string>
@@ -752,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi වඩා කැමතියි (Wi-Fi නොමැති නම් පමණක් සෙලියුලර් ජාලය භාවිතා කරයි)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"සෙලියුලර් වඩා කැමතියි (සෙලියුලර් ජාලය නොමැති නම් පමණක් Wi-Fi භාවිතා කරයි)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi වඩා කැමතියි (සෙලියුලර් ජාලය කිසිදා භාවිතා නොකරයි. Wi-Fi නොමැති නම් පමණක් ඇමතුම් ගැනීම සහ ලබාගැනීම කළ නොහැක)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"රෝමිං කරන අතර WFC හුවමාරුව"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"රෝමිං කරන විට Wi-Fi හඬ ඇමතුම් සෙලියුලර් ජාලය වෙත හුවමාරු කිරීමට ඉඩ දෙන්න"</string>
     <string name="home_settings" msgid="212375129455718176">"මුල් පිටුව"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"දර්ශනය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
@@ -1122,10 +1111,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ස්ථානය නිමානය කිරීමට GPS, Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ස්ථානය නිමානය කිරීමට Wi-Fi සහ සෙලියුලර් ජාල භාවිතා කරන්න"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ඔබේ ස්ථානය නිර්ණය කිරීමට GPS භාවිත කරන්න"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"පරිලෝකනය කිරීම"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"පරිලෝකනය කිරීම"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi සහ සෙලියුලර් ජාල ස්ථාන"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ඔබගේ ස්ථානය ඉක්මනින් තීරණය කිරීමට යෙදුම් හට Google හි ස්ථාන සේවා භාවිතා කිරීමට ඉඩ දෙන්න. නිර්නාමික ස්ථාන දත්ත එකතු කර Google වෙත යැවෙනු ඇත."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi මඟින් ස්ථානය හඳුනාගන්නා ලදි"</string>
@@ -1455,10 +1442,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM අගුළු ඇරීම සබල කිරීම ඔබගේ උපාංගයේ PIN එක ඇතුළු කරන්න"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM අඟුල ඇරීමට ඉඩ දෙන්න?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"අවවාදයයි: මෙම සැකසීම සක්‍රිය විට මෙම උපාංගයේ උපාංගය ආරක්ෂා කිරීමේ විශේෂාංගය වැඩනොකරයි."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ලෝගයේ අන්තරාවක ප්‍රමාණය"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ලොග අන්තරාවකට ලෝගයේ ප්‍රමාණය තෝරන්න"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"ව්‍යාජ ස්ථානයන්ට අවසර දෙන්න"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"ව්‍යාජ ස්ථාන අනුමත කරන්න"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"උපලක්ෂණ පරික්ෂාව බැලීම සබල කරන්න"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"ජාලකරණය"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"නොරැහැන් සංදර්ශක සහතිකය"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"විස්තරාත්මක Wi‑Fi ලොග් කිරීම සබල කරන්න"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ආක්‍රමණික Wi‑Fi සිට සෙලියුලර් බාර දීම"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi රෝම් පරිලෝකන වෙතට සැමවිට අවසර දෙන්න"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ලෙගසි DHCP සේවාලාභියා භාවිත කරන්න"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"නොරැහැන් සංදර්ශක සහතිකය සඳහා විකල්ප පෙන්වන්න"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ලොග් මට්ටම වැඩි කරන්න, Wi‑Fi තෝරනයෙහි SSID RSSI අනුව පෙන්වන්න"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"සබල විට Wi‑Fi සිග්නලය අඩු විට Wi‑Fi දත්ත සම්බන්ධතාවය සෙලියුලර් වෙත භාර දීමට වඩා ආක්‍රමණික වේ"</string>
@@ -1470,6 +1464,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"ව්‍යාජ ස්ථානයන්ට අවසර දෙන්න"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ව්‍යාජ ස්ථාන අනුමත කරන්න"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"උපලක්ෂණ පරික්ෂාව බැලීම සබල කරන්න"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"නව Android DHCP සේවාලාභියා වෙනුවට Lollipop වෙතින් DHCP සේවාලාභියා භාවිත කරන්න."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB දෝශාවේක්ෂණයට ඉඩ දෙන්නද?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB දෝශාවේක්ෂණය සංවර්ධන කටයුතු සඳහා පමණක් යොදාගැනේ. එය ඔබගේ පරිගණකය සහ ඔබගේ උපාංගය අතර දත්ත පිටපත් කිරීමට පමණක් භාවිතා කරන්න, ඔබගේ උපාංගය මත දැනුම්දීම් රහිතව යෙදුම් ස්ථාපනය කරන්න, සහ ලොග් දත්ත කියවන්න."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ඔබ මින්පෙර අවසර ලබාදුන් සියළුම පරිගණක වෙතින් USB නිදොස්කරණට ප්‍රවේශය අහෝසි කරන්නද?"</string>
@@ -2370,7 +2365,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ජාලයේ  සම්බන්ධතාවය"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"කෙටි පණිවිඩ කෙටි පණිවිඩ යැවීම පණිවිඩ යැවීම"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"සෙල්‍යුලර් සෙල් වාහකයා රැහැන් රහිත දත්ත 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi ඇමතුම අමතමින් රෝමිං හුවමාරුව"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi call ඇමතුම අමතමින්"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ආරම්භකය"</string>
     <string name="keywords_display" msgid="6709007669501628320">"තිරය ස්පර්ශ තිරයකි"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"අඳුරු තීරය ස්පර්ෂ තීරය බැටරිය"</string>
@@ -2395,10 +2390,8 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"ගිණුම"</string>
     <string name="keywords_users" msgid="4673901601478559100">"සීමා කිරීම සීමා කරනවා සීමා කරන ලදි"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"පෙළ නිවැරදි කිරීම ශබ්ද නිවැරදි කරන්න කම්පනය වන්න ස්වයං භාෂා ඉංගිතය යෝජනා කරන්න යෝජනා කළ තේමා අහිතකර වචන ඉමොජි වර්ග අන්තර්ජාතික"</string>
-    <!-- no translation found for keywords_reset_apps (6420313678620788457) -->
-    <skip />
-    <!-- no translation found for keywords_all_apps (5377153522551809915) -->
-    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"සුපුරුදු මනාප යළි පිහිටුවන්න"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"යෙදුම් බාගැනීම යෙදුම් පද්ධති"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"සර්පණය මුරපදය රටාව pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
@@ -2559,25 +2552,16 @@
     </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"ඇතැම් පෙරනිමියන් සකස් කර ඇත"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"පෙරනිමියන් සකසා නොමැත"</string>
-    <!-- no translation found for filter_all_apps (1988403195820688644) -->
-    <skip />
-    <!-- no translation found for filter_enabled_apps (3318021007093070639) -->
-    <skip />
-    <!-- no translation found for filter_personal_apps (3277727374174355971) -->
-    <skip />
-    <!-- no translation found for filter_work_apps (24519936790795574) -->
-    <skip />
-    <!-- no translation found for filter_notif_blocked_apps (3446926933792244485) -->
-    <skip />
-    <!-- no translation found for filter_notif_priority_apps (5965001885749195239) -->
-    <skip />
-    <!-- no translation found for filter_notif_sensitive_apps (412490487743581673) -->
-    <skip />
-    <!-- no translation found for reset_app_preferences_description (7718912868244058770) -->
-    <skip />
-    <!-- no translation found for all_apps_summary (3754827293203127282) -->
-    <skip />
-    <!-- no translation found for advanced_apps (4812975097124803873) -->
-    <skip />
+    <string name="filter_all_apps" msgid="1988403195820688644">"සියලු යෙදුම්"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"සබලයි"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"අවහිර කරන ලදි"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"ප්‍රමුඛතාව"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"සංවේදී"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"සියලු යෙදුම් අතර මනාප සුපුරුදු වෙතට යළි පිහිටුවන්න"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"පද්ධති සහ බාගත් යෙදුම් ඇතුළත්ව, යෙදුම් <xliff:g id="COUNT">%d</xliff:g> ක් ස්ථාපනය කර ඇත"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d46c573..070eee1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kedykoľvek uvidíte túto ikonu, môžete na identifikáciu alebo povolenie nákupu použiť odtlačok prsta."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Pridať"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Podarilo sa nám rozpoznať iba časť odtlačku. Skúste to znova."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Snímač odtlačkov je špinavý. Vyčistite ho a skúste to znova."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Pohli ste prstom príliš rýchlo. Skúste to znova."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Pohli ste prstom príliš pomaly. Skúste to znova."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Došlo k chybe spracovania. Skúste to znova."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hardvér nie je k dispozícii"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Odtlačok prsta nie je možné uložiť. Odstráňte existujúci odtlačok."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Časový limit rozpoznania odtlačku vypršal. Skúste to znova."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať telefón"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Uprednostňuje sa Wi-Fi (ak je Wi-Fi nedostupná, použije sa mobilná sieť)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Uprednostňuje sa mobilné pripojenie (Wi-Fi sa použije iba vtedy, keď bude mobilná sieť nedostupná)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Iba Wi-Fi (Mob. sieť sa nepoužije nikdy. Ak je Wi-Fi nedostupná, nedajú sa hovory prijímať ani uskutočňovať)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Odovzdanie volaní cez Wi-Fi pri roamingu"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Umožnite pri roamingu odovzdanie hovorov v sieti Wi-Fi do mobilnej siete"</string>
     <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Na určenie polohy používať technológiu GPS, sieť Wi-Fi a mobilné siete"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Na určenie polohy používať sieť Wi-Fi a mobilné siete"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Určovať polohu pomocou GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Vyhľadávanie"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Urč. polohy pomocou Wi-Fi a mobil. 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>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ak chcete aktivovať odomknutie OEM, zadajte kód PIN zariadenia"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Povoliť odblokovanie OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UPOZORNENIE: V prípade, že bude toto nastavenie zapnuté, funkcie ochrany zariadenia nebudú na tomto zariadení fungovať."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Veľkosti vyrovnávacej pamäte denníka"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veľkosti den. na vyrov. pamäť den."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Povoliť kontrolu atribútov zobrazenia"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Možnosti siete"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Povoliť prihlasovanie Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vždy povoliť funkciu Wi-Fi Roam Scans"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Použiť staršiu verziu klienta DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobraziť možnosti certifikácie bezdrôtového displeja"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Zvýšiť úroveň prihlasov. do Wi-Fi, zobraziť na SSID RSSI v nástroji Wi-Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Keď túto možnosť povolíte, Wi-Fi bude s väčšou intenzitou odovzdávať dát. pripoj. na mob. sieť vtedy, keď bude slabý signál Wi-Fi"</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Povoliť kontrolu atribútov zobrazenia"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Použitie klienta DHCP z verzie Lollipop namiesto nového klienta Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladenie prostredníctvom USB je určené iba na účely vývoja. Použite ho na kopírovanie dát medzi počítačom a zariadením, inštaláciu aplikácií do zariadenia bez upozornenia a čítanie údajov denníka."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Odvolať prístup k ladeniu USB zo všetkých počítačov, ktoré ste predtým autorizovali?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sieť pripojenie"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textová správa poslať správy SMS a MMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilný operátor mobilné dáta bezdrôtový prenos 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi hovor volanie roaming odovzdanie"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi hovor volanie"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"obrazovka dotyková obrazovka"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"stlmiť displej dotyková obrazovka batéria"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Boli nainštalované aplikácie vrátane systémových a stiahnutých aplikácií (počet: <xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 569570e..a0460a0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ko vidite to ikono, lahko za preverjanje istovetnosti ali odobritev nakupa uporabite prstni odtis."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Dodaj"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprej"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Zaznan delni prstni odtis. Poskusite znova."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Tipalo prstnih odtisov je umazano. Očistite ga in poskusite znova."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Prehiter premik prsta. Poskusite znova."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Prepočasen premik prsta. Poskusite znova."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Obdelava ni mogoča. Poskusite znova."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Strojna oprema ni na voljo."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Prstnega odtisa ni mogoče shraniti. Odstranite obstoječi prstni odtis."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Dosežena časovna omejitev za prstni odtis. Poskusite znova."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Prednostno – Wi-Fi (Uporablja mobilno omrežje, če Wi-Fi ni na voljo.)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Prednostno – mobilno omrežje (Wi-Fi uporablja samo, če mobilno omrežje ni na voljo.)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Samo Wi-Fi (Ne uporablja mobil. omrežja. Klicanje ali sprejemanje klicev brez Wi-Fi-ja ni mogoče.)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Prenos klicev WFC med gost."</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Omogočanje prenosa glas. klicev prek Wi-Fi-ja v mobilno omrežje med gostovanjem"</string>
     <string name="home_settings" msgid="212375129455718176">"Začetna stran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Uporaba GPS-ja, Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Uporaba Wi-Fi-ja in mobilnih omrežij za določanje lokacije"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Uporaba GPS-ja za določanje lokacije"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Iskanje"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iskanje"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokac. z Wi-Fi-jem in mob. om."</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>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Če želite omogočiti odklepanje OEM, vnesite kodo PIN naprave"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Želite omogočiti odklepanje OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OPOZORILO: Ko je vklopljena ta nastavitev, funkcije za zaščito naprave v tej napravi ne bodo delovale."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti medpomnilnikov zapisovalnika dnevnika"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velik. zap. dnev. za medpom. dnev."</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Omogoči pregled atributa pogleda"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Omrežja"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Omogoči podrob. zapis. dnevnika za Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Odločen prehod iz Wi-Fi-ja v mobil. omr."</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vedno omogoči iskanje omrežij Wi-Fi za gostovanje"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Uporaba starejšega odjemalca DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži možnosti za potrdilo brezžičnega zaslona"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povečaj raven zapis. dnev. za Wi-Fi; v izbir. Wi‑Fi-ja pokaži glede na SSID RSSI"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Če je ta možnost omogočena, Wi-Fi odločneje preda podatkovno povezavo mobilnemu omrežju, ko je signal Wi-Fi šibek"</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Omogoči pregled atributa pogleda"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Uporaba odjemalca DHCP za Lollipop namesto novega odjemalca DHCP za Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Odpravljanje težav s povezavo USB je namenjeno samo za razvoj. Lahko ga uporabljate za kopiranje podatkov med računalnikom in napravo, nameščanje aplikacij v napravo brez obveščanja in branje podatkov v dnevniku."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Ali želite preklicati dostop do odpravljanja težav prek povezave USB iz vseh računalnikov, ki ste jih pooblastili?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi omrežna povezava"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"sporočilo SMS pošiljanje sporočil SMS sporočila SMS izmenjava sporočil SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobilno mobilni operater brezžični podatki 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi klic klicanje gostovanje prenos"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi klic klicanje"</string>
     <string name="keywords_home" msgid="3626170808219458848">"zaganjalnik"</string>
     <string name="keywords_display" msgid="6709007669501628320">"zaslon zaslon na dotik"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"zatemnitev zaslona zaslon na dotik akumulator"</string>
@@ -2411,7 +2407,7 @@
     <string name="keywords_users" msgid="4673901601478559100">"omejitev omeji omejeno"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"popravljanje besedila pravilno zvok vibriranje samodejno jezik poteza predlaganje predlog tema žaljiva beseda vrsta znak emoji mednarodno"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ponastavitev nastavitve privzeto"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije prenos aplikacije sistem"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije prenos sistem"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"podrsanje geslo vzorec pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
@@ -2482,7 +2478,7 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Obravnavanje kot prednostno"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Naj se slišijo obvestila te aplikacije, ko je funkcija »Ne moti« nastavljena na »Samo prednostno«"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Omogočanje kukanja"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Naj ta aplikacija poudari nekatera obvestila, tako da jih za kratek hip pokaže na trenutnem zaslonu"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Naj ta aplikacija poudari nekatera obvestila, tako da jih za hip pokaže na trenutnem zaslonu"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Skrivanje občutljive vsebine"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Ko je naprava zaklenjena, skrij vsebino obvestil te aplikacije, ki bi lahko razkrivala zasebne podatke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Število nameščenih aplikacij, vključno s sistemskimi in prenesenimi aplikacijami: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1ca4472..4f14a6b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Када год видите ову икону, можете да користите отисак прста ради идентификације или да бисте одобрили куповину."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додај"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Даље"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Откривен је делимични отисак прста. Покушајте поново."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Сензор за отиске прстију је прљав. Очистите га и покушајте поново."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Превише брзо сте померили прст. Покушајте поново."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Превише споро сте померили прст. Покушајте поново."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Обрада није могућа. Покушајте поново."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Хардвер није доступан."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Није могуће ускладиштити отисак прста. Уклоните неки од постојећих отисака прстију."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Временско ограничење за отисак прста је истекло. Покушајте поново."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифровање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифруј таблет"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифруј телефон"</string>
@@ -759,8 +751,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Предност има Wi-Fi (Мобилна мрежа се користи само ако Wi-Fi није доступан)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Предност има мобилна мрежа (Wi-Fi се користи само ако мобилна мрежа није доступна)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само Wi-Fi (Никада не користи мобилну мрежу. Упућивање или прим. позива није могуће ако је Wi-Fi недоступан)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Преуз. управљ. Wi-Fi позивањем у ромингу"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Дозволи мобилној мрежи да у ромингу преузме управљање глас. позивима од Wi-Fi-ја"</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1128,10 +1118,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Коришћење GPS-а, Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Коришћење Wi‑Fi-ја и мобилних мрежа за одређивање локације"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Користите GPS за одређивање локације"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Скенирање"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скенирање"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Лок. на осн. Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
@@ -1461,10 +1449,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Унесите PIN уређаја да бисте омогућили откључавање од стране произвођача оригиналне опреме (OEM)"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Желите ли да дозволите откључавање произвођача оригиналне опреме (OEM)?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"УПОЗОРЕЊЕ: Функције за заштиту уређаја неће функционисати на овом уређају док је ово подешавање укључено."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Величине бафера података у програму за евидентирање"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Изаберите величине по баферу евиденције"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Омогући проверу атрибута за преглед"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Умрежавање"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Омогући детаљнију евиденцију за Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агресиван прелаз са Wi‑Fi мреже на мобилну"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Увек дозволи скенирање Wi‑Fi-ја у ромингу"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Користи застарели DHCP клијент"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Приказ опција за сертификацију бежичног екрана"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Повећава ниво евидентирања за Wi‑Fi. Приказ по SSID RSSI-у у бирачу Wi‑Fi мреже"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Када се омогући, Wi‑Fi ће бити агресивнији при пребацивању мреже за пренос података на Мобилну, када је Wi‑Fi сигнал слаб"</string>
@@ -1476,6 +1471,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Омогући проверу атрибута за преглед"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Користите DHCP клијент из Lollipop-а уместо новог Android DHCP клијента."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Отклањање USB грешака намењено је само за сврхе програмирања. Користите га за копирање података са рачунара на уређај и обрнуто, инсталирање апликација на уређају без обавештења и читање података из евиденције."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Желите ли да опозовете приступ отклањању USB грешака са свих рачунара које сте претходно одобрили?"</string>
@@ -2376,7 +2372,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежа веза"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текст порука слање SMS-а поруке размена порука"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"мобилни мобилни оператер бежично подаци 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi позив позивање роминг преузимање управљања"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi позив позивање"</string>
     <string name="keywords_home" msgid="3626170808219458848">"покретач"</string>
     <string name="keywords_display" msgid="6709007669501628320">"екран додирни екран"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затамнити екран додирни екран батерија"</string>
@@ -2577,4 +2573,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Број инсталираних апликација је <xliff:g id="COUNT">%d</xliff:g>, укључујући системске и преузете апликације"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b6c7a9f..340d5c3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"När du ser den här ikonen kan du identifiera dig eller auktorisera ett köp med hjälp av ditt fingeravtryck."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Lägg till"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Nästa"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Ofullständigt fingeravtryck. Försök igen."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Fingeravtryckssensorn är smutsig. Rengör den och försök igen."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Du flyttade fingret för snabbt. Försök igen."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Du flyttade fingret för långsamt. Försök igen."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Det går inte att bearbeta fingeravtrycket. Försök igen."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Maskinvaran är inte tillgänglig."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Fingeravtrycket kan inte lagras. Ta bort ett befintligt fingeravtryck."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Tidsgränsen för fingeravtrycket har uppnåtts. Försök igen."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi i första hand (Använder endast mobilnätverk om Wi-Fi inte är tillgängligt)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobil i första hand (Använder endast Wi-Fi om mobilnätverket inte är tillgängligt)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Endast Wi-Fi (Använder aldrig mobilnätverk. Det går inte att ringa eller ta emot samtal om Wi-Fi inte är tillgängligt)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC-överlämning vid roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Tillåt överlämning av röstsamtal till mobilnätverk vid roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Använd GPS, Wi-Fi och mobilnät för att bestämma plats"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Använd Wi-Fi och mobilnät för att bestämma plats"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Avgör plats med hjälp av GPS"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Genomsöker"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Genomsöker"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi- och mobilnätsplats"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ange enhetens pinkod om du vill aktivera OEM-upplåsning"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vill du tillåta OEM-upplåsning?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"Varning! Funktionerna för enhetsskydd fungerar inte på enheten när den här inställningen är aktiverad."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Buffertstorlekar för logg"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Välj loggstorlekar per loggbuffert"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivera inspektion av visningsattribut"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Nätverk"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifiering för Wi-Fi-skärmdelning"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Aktivera utförlig loggning för Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressiv överlämning fr. Wi-Fi t. mobil"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Tillåt alltid sökning efter Wi-Fi-roaming"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Använd äldre DHCP-klient"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Visa certifieringsalternativ för Wi-Fi-skärmdelning"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Öka loggningsnivån för Wi-Fi, visa per SSID RSSI i Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"När funktionen har aktiverats kommer dataanslutningen lämnas över från Wi-Fi till mobilen på ett aggressivare sätt när Wi-Fi-signalen är svag"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Aktivera inspektion av visningsattribut"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Använd DHCP-klienten från Lollipop i stället för den nya Android DHCP-klienten."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB-felsökning ska endast användas i utvecklingssyfte. Använd den för att kopiera data mellan datorn och enheten, installera appar på enheten utan meddelanden och läsa loggdata."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Vill du återkalla åtkomst till USB-felsökning för alla datorer som du tidigare har godkänt?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"textmeddelande sms:a meddelanden skicka sms"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"mobiltelefon mobil operatör trådlös data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi samtal ringer roaming överlämning"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi samtal ringer"</string>
     <string name="keywords_home" msgid="3626170808219458848">"översikt"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skärm pekskärm"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"tona ned skärm pekskärm batteri"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> appar har installerats, inklusive systemappar och nedladdade appar"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1ae2a42..17d41ce 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -364,14 +364,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ongeza"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Inayofuata"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Kihisi kimegundua sehemu ya kitambulisho. Tafadhali jaribu tena."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Kihisi kitambulisho ni kichafu. Tafadhali kisafishe na ujaribu tena."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Ulisogeza kidole kwa kasi mno. Tafadhali jaribu tena."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Ulisogeza kidole pole pole mno. Tafadhali jaribu tena."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Haikuweza kuchakata. Jaribu tena."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Maunzi hayapatikani."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Kitambulisho hakiwezi kuhifadhiwa. Tafadhali ondoa kitambulisho kilichopo."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Muda wa kitambulisho umekwisha. Jaribu tena."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
@@ -755,8 +747,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Inayopendelea Wi-Fi (Hutumia mtandao wa simu wakati tu Wi-Fi haipatikani)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Inayopendelea mitandao ya simu za mkononi (Hutumia Wi-Fi wakati tu mtandao wa simu haupatikani)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi pekee (Haitumii kamwe mtandao wa simu. Haiwezi kupiga au kupokea simu kama Wi-Fi haipatikani)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Hamisha WFC wakati unatumia mitandao mingine"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Ruhusu simu za sauti za Wi-Fi zihamishwe hadi kwenye mitandao mingine ya simu za mkononi"</string>
     <string name="home_settings" msgid="212375129455718176">"Mwanzo"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
@@ -1125,10 +1115,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Tumia GPS, Wi-Fi na mitandao ya simu kutambua mahali"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Tumia Wi-Fi na mitandao ya simu kutambua mahali"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Inachanganua"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Inachanganua"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Mahali pa mtandao wa Wi-Fi na simu za mkononi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -1458,10 +1446,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Weka PIN ya kifaa chako ili uwashe kipengele cha fungua kwa OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Je, ungependa kuruhusu ufunguaji wa OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ONYO: Vipengele vya ulinzi wa kifaa havitafanya kazi kwenye kifaa hiki wakati mpangilio huu umewashwa."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Ukubwa wa kiweka bafa ya kumbukumbu"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chagua ukubwa wa kila Kumbukumbu"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Washa ukaguzi wa sifa ya onyesho"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mtandao"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukabidhi kutoka Wifi kwenda Mtandao wa Simu"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Ruhusu Uchanganuzi wa Matumizi ya Mitandao mingine"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Tumia kiteja cha DHCP kilichopitwa na wakati"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Onyesha chaguo za cheti cha kuonyesha pasiwaya"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Ongeza hatua ya uwekaji kumbukumbu ya Wi-Fi, onyesha kwa kila SSID RSSI kwenye Kichukuzi cha Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Ikiwashwa, Wifi itakabidhi kwa hima muunganisho wa data kwa mtandao wa Simu za Mkononi, mawimbi ya Wifi yanapokuwa hafifu"</string>
@@ -1473,6 +1468,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Washa ukaguzi wa sifa ya onyesho"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Tumia kiteja cha DHCP kutoka Lollipop badala ya kiteja kipya cha DHCP cha Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ueuaji wa USB umekusudiwa kwa malengo ya utengenezaji tu. Itumi kunakili data kati ya kompyuta yako na kifaa chako, kusanidi programu kwa kifaa chako bila arifa, na kusoma data ya rajisi."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Unataka kubatilisha ufikiaji wa urekebishaji wa USB kutoka kwenye kompyuta zote ulizotangulia kuidhinisha?"</string>
@@ -2373,7 +2369,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"muunganisho wa mtandao wa wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ujumbe wa maandishi ujumbe ujumbe ujumbe"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"simu ya mkononi simu mtoa huduma isiyotumia waya data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"kuhamisha simu ya wi-fi hadi kwenye mtandao mwingine"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"upigaji simu kwa wi-fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"kifungua programu"</string>
     <string name="keywords_display" msgid="6709007669501628320">"skrini ya kugusa"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"fifiliza skrini skrini ya kugusa betri"</string>
@@ -2571,4 +2567,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Programu <xliff:g id="COUNT">%d</xliff:g> zimesakinishwa, ikiwemo mfumo na programu zilizopakuliwa"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 45f2ca6..69d7d7b 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"இந்த ஐகானைப் பார்க்கும்போதெல்லாம், அடையாளப்படுத்தலுக்காக அல்லது வாங்குதலை அங்கீகரிக்க, நீங்கள் கைரேகையைப் பயன்படுத்தலாம்."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"சேர்"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"அடுத்து"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"கைரேகையை ஓரளவுதான் கண்டறிய முடிந்தது. மீண்டும் முயலவும்."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"கைரேகை உணர்வியில் தூசி உள்ளது. சுத்தம் செய்து, முயலவும்."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"விரலை வேகமாக எடுத்துவிட்டீர்கள். மீண்டும் முயலவும்."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"விரலை மெதுவாக எடுத்துவிட்டீர்கள். மீண்டும் முயலவும்."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"செயல்படுத்த முடியவில்லை. மீண்டும் முயலவும்."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"வன்பொருள் இல்லை."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"கைரேகையைச் சேமிக்க முடியவில்லை. ஏற்கனவே உள்ள கைரேகையை அகற்றவும்."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"கைரேகைக்கான நேரம் முடிந்தது. மீண்டும் முயலவும்."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"முறைமையாக்கம்"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"டேப்லெட்டை முறைமையாக்கு"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"மொபைலை முறைமையாக்கு"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"வைஃபைக்கு முன்னுரிமை (வைஃபை கிடைக்காத போது மட்டும், செல் நெட்வொர்க்கைப் பயன்படுத்தும்)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"செல்லுலாருக்கு முன்னுரிமை (செல் நெட்வொர்க் கிடைக்காத போது மட்டும், வைஃபையைப் பயன்படுத்தும்)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"வைஃபை மட்டும் (செல் நெட்வொர்க்கை பயன்படுத்தாது. வைஃபை இல்லையெனில் அழைக்கவோ, அழைப்பை பெறவோ முடியாது)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"ரோமிங்கின் போது WFC மாற்றம்"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"ரோமிங்கின் போது வைஃபை குரல் அழைப்புகளை செல் நெட்வொர்க்கிற்கு மாற்ற அனுமதிக்கும்"</string>
     <string name="home_settings" msgid="212375129455718176">"முகப்பு"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"தோற்றம்"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"இடத்தைக் கண்டறிய GPS, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"இடத்தைக் கண்டறிய, வைஃபை மற்றும் செல்லுலார் நெட்வொர்க்குகளைப் பயன்படுத்தவும்"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ஸ்கேன் செய்தல்"</string>
     <string name="location_network_based" msgid="6010456018401296590">"வைஃபை &amp; செல்லுலார் நெட்வொர்க் இடம்"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் பயன்பாடுகள், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM திறப்பை இயக்க, சாதனத்தின் பின்னை உள்ளிடவும்"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM திறத்தலை அனுமதிக்கவா?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"எச்சரிக்கை: இந்த அமைப்பு இயக்கப்பட்டிருக்கும்போது, சாதன பாதுகாப்பு அம்சங்கள் இந்தச் சாதனத்தில் இயங்காது."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"லாகர் பஃபர் அளவுகள்"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"லாக் பஃபர் ஒன்றிற்கு லாகர் அளவுகளைத் தேர்வுசெய்க"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"போலி இருப்பிடங்களை அனுமதி"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"போலி இருப்பிடங்களை அனுமதி"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"காட்சி பண்புக்கூறு சோதனையை இயக்கு"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"நெட்வொர்க்கிங்"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"வயர்லெஸ் காட்சிக்கான சான்றிதழ்"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"வைஃபை அதிவிவர நுழைவை இயக்கு"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ஒத்துழைக்காத வைஃபையிலிருந்து செல்லுலாருக்கு மாறு"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"எப்போதும் வைஃபை ரோமிங் ஸ்கேன்களை அனுமதி"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"அதிகாரப்பூர்வ DHCP க்ளையன்ட்டைப் பயன்படுத்து"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"வயர்லெஸ் காட்சி சான்றுக்கான விருப்பங்களைக் காட்டு"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wifi நுழைவு அளவை அதிகரித்து, வைஃபை தேர்வியில் ஒவ்வொன்றிற்கும் SSID RSSI ஐ காட்டுக"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"இயக்கப்பட்டதும், வைஃபை சிக்னல் குறையும் போது, வைஃபை முழுமையாக ஒத்துழைக்காமல் இருப்பதால் செல்லுலாரின் தரவு இணைப்புக்கு மாறும்"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"போலி இருப்பிடங்களை அனுமதி"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"போலி இருப்பிடங்களை அனுமதி"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"காட்சி பண்புக்கூறு சோதனையை இயக்கு"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"புதிய Android DHCP க்ளையன்ட்டிற்குப் பதிலாக, Lollipop இலிருந்து DHCP க்ளையன்ட்டைப் பயன்படுத்தவும்."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB பிழைத்திருத்தத்தை அனுமதிக்கவா?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB பிழைத்திருத்தம் மேம்படுத்தல் நோக்கங்களுக்காக மட்டுமே. அதை உங்கள் கணினி மற்றும் சாதனத்திற்கு இடையில் தரவை நகலெடுக்கவும், அறிவிப்பு இல்லாமல் உங்கள் சாதனத்தில் பயன்பாடுகளை நிறுவவும், பதிவு தரவைப் படிக்கவும் பயன்படுத்தவும்."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"நீங்கள் ஏற்கனவே அனுமதித்த எல்லா கணினிகளிலிருந்தும் USB பிழைத்திருத்தத்திற்கான அணுகலைத் திரும்பப்பெற வேண்டுமா?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"வைஃபை நெட்வொர்க் இணைப்பு"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"உரை செய்தி செய்தியிடல் செய்திகள் செய்தி அனுப்புதல்"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"செல்லுலார் செல் கேரியர் வயர்லெஸ் டேட்டா 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"வைஃபை வை-ஃபை அழைப்பு அழைத்தல் ரோமிங் மாற்றம்"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"வைஃபை வை-ஃபை அழைப்பு அழைக்கிறது"</string>
     <string name="keywords_home" msgid="3626170808219458848">"துவக்கி"</string>
     <string name="keywords_display" msgid="6709007669501628320">"திரை டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
@@ -2375,7 +2371,7 @@
     <string name="keywords_display_night_mode" msgid="7652025075378505346">"அடர் தீம் இரவுப் பயன்முறை திரையை மங்கலாக்கல் ஒளிர்வை எதிர்மறையாக்கல்"</string>
     <string name="keywords_display_wallpaper" msgid="7778443098569037063">"பின்னணி தனிப்படுத்து தனிப்பயனாக்கு திரை"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"உரை அளவு"</string>
-    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"வெளிப்பாடு அனுப்பு"</string>
+    <string name="keywords_display_cast_screen" msgid="3167261692257302743">"அனுப்புதல் வெளிப்பாடு"</string>
     <string name="keywords_storage" msgid="6572905220031852173">"இடம் டிஸ்க் வட்டு இயக்ககம் சாதனம் பயன்பாடு"</string>
     <string name="keywords_battery" msgid="2096185085932675704">"பவர் பயன்பாடு சார்ஜ்"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"உச்சரிப்பு அகராதி எழுத்துச்சரிபார்ப்பு தன்னியக்க திருத்தம்"</string>
@@ -2460,9 +2456,9 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"முன்னுரிமையாகக் கருது"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"தொந்தரவு செய்யாதே என்பதில் முன்னுரிமை மட்டும் என அமைக்கப்பட்டிருக்கும் போது, இந்தப் பயன்பாட்டின் அறிவிப்புகள் கேட்கப்படும்"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"பார்க்க அனுமதி"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"சில அறிவிப்புகளை நடப்பு திரையில் சுருக்கிய வடிவத்தில் இழுத்துவிடுவதன் மூலம், இந்தப் பயன்பாடு அவற்றைத் தனிப்படுத்தும்"</string>
-    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"உணர்வுபூர்வமான உள்ளடக்கத்தை மறை"</string>
-    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"இந்தச் சாதனம் பூட்டப்பட்டிருக்கும்போது, தனிப்பட்ட தகவலை வெளிப்படுத்தக்கூடிய இந்தப் பயன்பாட்டின் அறிவிப்புகளில் உள்ள உள்ளடக்கத்தை மறைக்கும்."</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"சில அறிவிப்புகளை நடப்பு திரையில் சற்று இழுத்துவிடுவதன் மூலம், இந்தப் பயன்பாடு அவற்றைத் தனிப்படுத்தும்"</string>
+    <string name="app_notification_sensitive_title" msgid="8465860579482264139">"முக்கியமான உள்ளடக்கத்தை மறை"</string>
+    <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"இந்தச் சாதனம் பூட்டப்பட்டிருக்கும்போது, தனிப்பட்ட தகவலை வெளிப்படுத்தக்கூடிய இந்தப் பயன்பாட்டின் அறிவிப்புகளின் உள்ளடக்கத்தை மறைக்கும்."</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"தடுக்கப்பட்டது"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"முன்னுரிமை"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"முக்கியமானவை"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"சிஸ்டம் மற்றும் பதிவிறக்கிய பயன்பாடுகள் உள்பட, <xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டன"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index cc5639d..1b1112a 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"మీకు ఈ చిహ్నం కనిపించినప్పుడల్లా, మీరు గుర్తింపు కోసం లేదా కొనుగోలు ప్రామాణీకరణ కోసం మీ వేలిముద్రను ఉపయోగించవచ్చు."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"జోడించు"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"పాక్షిక వేలిముద్ర గుర్తించబడింది. దయచేసి మళ్లీ ప్రయత్నించండి."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"వేలిముద్ర సెన్సార్ మురికిగా ఉంది. దయచేసి శుభ్రపరిచి, మళ్లీ ప్రయత్నించండి."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"వేలిని చాలా తొందరగా కదిలించారు. దయచేసి మళ్లీ ప్రయత్నించండి."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"వేలిని చాలా నిదానంగా కదిలించారు. దయచేసి మళ్లీ ప్రయత్నించండి."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ప్రాసెస్ చేయలేకపోయింది. మళ్లీ ప్రయత్నించండి."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"హార్డ్‌వేర్ అందుబాటులో లేదు."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"వేలిముద్రను నిల్వ చేయడం సాధ్యపడదు. దయచేసి ఇప్పటికే ఉన్న వేలిముద్రను తీసివేయండి."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"వేలిముద్ర గడువు సమయం చేరుకుంది. మళ్లీ ప్రయత్నించండి."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"గుప్తీకరణ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"టాబ్లెట్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ఫోన్‌ను గుప్తీకరించండి"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fiకి ప్రాధాన్యత (Wi-Fi అందుబాటులో లేకపోతే మాత్రమే సెల్ నెట్‌వర్క్‌ను ఉపయోగిస్తుంది)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"సెల్యులార్‌కి ప్రాధాన్యత (సెల్ నెట్‌వర్క్ అందుబాటులో లేకుంటే మాత్రమే Wi-Fiని ఉపయోగిస్తుంది)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi మాత్రమే (ఎప్పుడూ సెల్ నెట్‌వర్క్ ఉపయోగించదు. Wi-Fi లేకుంటే కాల్‌లు చేయలేరు లేదా స్వీకరించలేరు)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"రోమింగ్‌లో ఉన్నప్పుడు WFC బదిలీ"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"రోమింగ్‌లో ఉన్నప్పుడు Wi-Fi వాయిస్ కాల్‌లను సెల్ నెట్‌వర్క్‌కి బదిలీ చేయడానికి అనుమతిస్తుంది"</string>
     <string name="home_settings" msgid="212375129455718176">"హోమ్"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"స్థానాన్ని గుర్తించడానికి GPS, Wi‑Fi, మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"స్థానాన్ని గుర్తించడానికి Wi‑Fi మరియు సెల్యులార్ నెట్‌వర్క్‌లను ఉపయోగించండి"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"స్కానింగ్"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"స్కానింగ్"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi &amp; సెల్యులార్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM అన్‌లాక్‌ను ప్రారంభించడానికి మీ పరికరం PINను నమోదు చేయండి"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM అన్‌లాకింగ్‌ను అనుమతించాలా?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"హెచ్చరిక: ఈ సెట్టింగ్ ఆన్ చేయబడినప్పుడు పరికరం రక్షణ లక్షణాలు ఈ పరికరంలో పని చేయవు."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"లాగర్ బఫర్ పరిమాణాలు"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"లాగ్ బఫర్‌కి లాగర్ పరిమా. ఎంచుకోండి"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"అనుకృత స్థానాలను అనుమతించు"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"అనుకృత స్థానాలను అనుమతించు"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"వీక్షణ లక్షణ పర్యవేక్షణను ప్రారంభించు"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"నెట్‌వర్కింగ్"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"వైర్‌లెస్ ప్రదర్శన ప్రమాణీకరణ"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi విశదీకృత లాగింగ్‌ను ప్రారంభించండి"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi‑Fi నుండి సెల్యులార్‌కి తీవ్ర ఒత్తిడితో మారడం"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi సంచార స్కాన్‌లను ఎల్లప్పుడూ అనుమతించు"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"లెగసీ DHCP క్లయింట్‌ను ఉపయోగించు"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"వైర్‌లెస్ ప్రదర్శన ప్రమాణపత్రం కోసం ఎంపికలను చూపు"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ఎంపికలో SSID RSSI ప్రకారం చూపబడే Wi‑Fi లాగింగ్ స్థాయిని పెంచండి"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ప్రారంభించబడినప్పుడు, Wi‑Fi సిగ్నల్ బలహీనంగా ఉంటే డేటా కనెక్షన్‌ను సెల్యులార్‌కి మార్చేలా Wi‑Fiపై మరింత తీవ్ర ఒత్తిడి కలుగుతుంది"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"అనుకృత స్థానాలను అనుమతించు"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"అనుకృత స్థానాలను అనుమతించు"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"వీక్షణ లక్షణ పర్యవేక్షణను ప్రారంభించు"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"కొత్త Android DHCP క్లయింట్‌కి బదులుగా Lollipop నుండి DHCP క్లయింట్‌ను ఉపయోగించండి."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB డీబగ్గింగ్‌ను అనుమతించాలా?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB డీబగ్గింగ్ అనేది అభివృద్ధి ప్రయోజనాల కోసం మాత్రమే ఉద్దేశించబడింది. మీ కంప్యూటర్ మరియు మీ పరికరం మధ్య డేటాను కాపీ చేయడానికి, నోటిఫికేషన్ లేకుండా మీ పరికరంలో అనువర్తనాలను ఇన్‌స్టాల్ చేయడానికి మరియు లాగ్ డేటాను చదవడానికి దీన్ని ఉపయోగించండి."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"మీరు గతంలో ప్రామాణీకరించిన అన్ని కంప్యూటర్‌ల నుండి USB డీబగ్గింగ్‌కు ప్రాప్యతను ఉపసంహరించాలా?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"వైఫై వై-ఫై నెట్‌వర్క్ కనెక్షన్"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"వచన సందేశం వచనం పంపడం సందేశాలు సందేశం పంపడం"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"సెల్యులార్ సెల్ క్యారియర్ వైర్‌లెస్ డేటా 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi కాల్ కాలింగ్ రోమింగ్ బదిలీ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi కాల్ కాలింగ్"</string>
     <string name="keywords_home" msgid="3626170808219458848">"లాంచర్"</string>
     <string name="keywords_display" msgid="6709007669501628320">"స్క్రీన్‌లో టచ్‌స్క్రీన్ భాగం"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"కాంతివిహీన స్క్రీన్ టచ్‌స్క్రీన్ బ్యాటరీ"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"సిస్టమ్ మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలతో సహా <xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a7a6182..22d13f0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"เมื่อใดก็ตามที่คุณเห็นไอคอนนี้ คุณสามารถใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุญาตการซื้อได้"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"เพิ่ม"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"ตรวจพบลายนิ้วมือเพียงบางส่วน โปรดลองอีกครั้ง"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"เซ็นเซอร์ลายนิ้วมือไม่สะอาด โปรดทำความสะอาดและลองอีกครั้ง"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"เคลื่อนนิ้วเร็วเกินไป โปรดลองอีกครั้ง"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"เคลื่อนนิ้วช้าเกินไป โปรดลองอีกครั้ง"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"ไม่สามารถดำเนินการได้ โปรดลองอีกครั้ง"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ฮาร์ดแวร์ไม่พร้อมใช้งาน"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"ไม่สามารถเก็บลายนิ้วมือได้ โปรดนำลายนิ้วมือที่มีอยู่ออก"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"หมดเวลาใช้ลายนิ้วมือแล้ว โปรดลองอีกครั้ง"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"การเข้ารหัส"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสโทรศัพท์"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ต้องการใช้ Wi-Fi (ใช้เครือข่ายมือถือต่อเมื่อ Wi-Fi ไม่พร้อมใช้งาน)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ต้องการใช้เครือข่ายมือถือ (ใช้ Wi-Fi ต่อเมื่อเครือข่ายมือถือไม่พร้อมใช้งาน)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi เท่านั้น (ไม่ใช้เครือข่ายมือถือเลย ไม่สามารถโทรออกหรือรับสายได้หาก Wi-Fi ไม่พร้อมใช้งาน)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"โอน WFC ขณะโรมมิ่ง"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"อนุญาตให้โอนการโทรด้วยเสียงผ่าน Wi-Fi ไปยังเครือข่ายมือถือเมื่อโรมมิ่ง"</string>
     <string name="home_settings" msgid="212375129455718176">"หน้าแรก"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"ใช้ GPS, Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"ใช้ Wi-Fi และเครือข่ายมือถือเพื่อระบุตำแหน่ง"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ใช้ GPS เพื่อระบุตำแหน่ง"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"การสแกน"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"การสแกน"</string>
     <string name="location_network_based" msgid="6010456018401296590">"ตำแหน่ง Wi-Fi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"ป้อน PIN ของอุปกรณ์เพื่อเปิดใช้การปลดล็อก OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"อนุญาตการปลดล็อก OEM ไหม"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"คำเตือน: คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานบนอุปกรณ์นี้ขณะที่การตั้งค่านี้เปิดอยู่"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"ขนาดบัฟเฟอร์ของ Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"เลือกขนาด Logger ต่อบัฟเฟอร์ไฟล์บันทึก"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"เปิดใช้การตรวจสอบแอตทริบิวต์มุมมอง"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"เครือข่าย"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"เปิดใช้การบันทึกรายละเอียด Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"สลับ Wi‑Fi เป็นมือถือเมื่อสัญญาณอ่อน"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ใช้การสแกน Wi-Fi ข้ามเครือข่ายเสมอ"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"ใช้ไคลเอ็นต์ DHCP เดิม"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"แสดงตัวเลือกสำหรับการรับรองการแสดงผล แบบไร้สาย"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"เพิ่มระดับการบันทึก Wi‑Fi แสดงต่อ SSID RSSI ในตัวเลือก Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"เมื่อเปิดใช้แล้ว Wi-Fi จะส่งผ่านการเชื่อมต่อข้อมูลไปยังเครือข่ายมือถือในทันทีที่พบสัญญาณ Wi-Fi อ่อน"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"เปิดใช้การตรวจสอบแอตทริบิวต์มุมมอง"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ใช้ไคลเอ็นต์ DHCP จาก Lollipop แทนไคลเอ็นต์ DHCP ใหม่บน Android"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"การแก้ไขข้อบกพร่อง USB มีไว้เพื่อการพัฒนาเท่านั้น ให้ใช้การแก้ไขนี้เพื่อคัดลอกข้อมูลระหว่างคอมพิวเตอร์และอุปกรณ์ ติดตั้งแอปพลิเคชันบนอุปกรณ์โดยไม่มีการแจ้งเตือน และอ่านข้อมูลบันทึก"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"ยกเลิกการเข้าถึงเพื่อแก้ปัญหา USB จากคอมพิวเตอร์ทุกเครื่องที่คุณได้ให้สิทธิ์ก่อนหน้านี้หรือไม่"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"การเชื่อมต่อเครือข่าย wifi wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"ข้อความ การส่งข้อความ ข้อความ การส่งข้อความ"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"มือถือ ผู้ให้บริการมือถือ ไร้สาย ข้อมูล 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi โทร การโทร โรมมิ่ง โอนช่องสัญญาณ"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi Wi-Fi โทร การโทร"</string>
     <string name="keywords_home" msgid="3626170808219458848">"Launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"หน้าจอ หน้าจอสัมผัส"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"ติดตั้ง <xliff:g id="COUNT">%d</xliff:g> แอป รวมถึงแอประบบและแอปที่ดาวน์โหลดแล้ว"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 02f84c3..b22427e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kapag nakikita mo ang icon na ito, maaari mong gamitin ang iyong fingerprint para sa pagkakakilanlan o upang pahintulutan ang isang pagbili."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Magdagdag"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Susunod"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Hindi buo ang nakitang fingerprint. Pakisubukang muli."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Marumi ang sensor ng fingerprint. Pakilinis at subukang muli."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Masyadong mabilis ang paggalaw ng daliri. Pakisubukang muli."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Masyadong mabagal ang paggalaw ng daliri. Pakisubukang muli."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Hindi maproseso. Subukang muli."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Hindi available ang hardware."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Hindi maiimbak ang fingerprint. Mangyaring mag-alis ng isang umiiral nang fingerprint."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Nag-time out ang fingerprint. Subukang muli."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang telepono"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Mas gusto ang Wi-Fi (Gumagamit lang ng cell network kung walang Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mas gusto ang cellular (Gumagamit lang ng Wi-Fi kung walang cell network)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi lang (Di gumagamit ng cell network. Di makakatawag o makakatanggap ng tawag kung walang Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC handoff kapag naka-roaming"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Payagan ang Wi-Fi voice call na mag-handoff sa cell network kapag naka-roaming"</string>
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Gumamit ng GPS, Wi‑Fi at mga cellular network upang matukoy ang lokasyon"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Gumamit ng Wi-Fi at cellular network upang matukoy ang lokasyon"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gamitin ang GPS upang matukoy ang lokasyon"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Pagsa-scan"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Nagsa-scan"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Lokasyon ng Wi-Fi at cellular 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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Ilagay ang PIN ng iyong device upang ma-enable ang pag-unlock na OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Payagan ang pag-a-unlock ng OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"BABALA: Hindi gagana ang mga feature sa pagprotekta sa device sa device na ito habang naka-on ang setting na ito."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Mga laki ng buffer ng Logger"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pumili laki Logger kada log buffer"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"I-enable ang pagsisiyasat sa attribute na view"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Networking"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"I-enable ang Pagla-log sa Wi‑Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Agresibong paglipat ng Wi‑Fi sa Cellular"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Palaging payagan ang Mga Pag-scan sa Roaming ng Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Gumamit ng legacy na DHCP client"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ipakita ang mga opsyon para sa certification ng wireless display"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Pataasin ang antas ng Wi‑Fi logging, ipakita sa bawat SSID RSSI sa Wi‑Fi Picker"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Kapag naka-enable, mas magiging agresibo ang Wi‑Fi sa paglipat ng koneksyon ng data sa Cellular, kapag mahina ang signal ng Wi‑Fi"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"I-enable ang pagsisiyasat sa attribute na view"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Gamitin ang DHCP client mula sa Lollipop sa halip na ang bagong Android DHCP client."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ang pag-debug ng USB ay nilalayon para sa mga layuning pagpapabuti lamang. Gamitin ito upang kumopya ng data sa pagitan ng iyong computer at iyong device, mag-install ng apps sa iyong device nang walang notification, at magbasa ng data ng log."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Bawiin ang access sa pag-debug ng USB mula sa lahat ng computer na dati mong pinahintulutan?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"text message pagte-text mga mensahe pagmemensahe"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"cellular cell carrier wireless na data 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi tawag pagtawag roaming handoff"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi tawag pagtawag"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="6709007669501628320">"screen na touchscreen"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"i-dim ang screen touchscreen baterya"</string>
@@ -2457,10 +2453,10 @@
     <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Huwag kailanman magpakita ng mga notification mula sa app na ito"</string>
-    <string name="app_notification_priority_title" msgid="5949923919607295595">"Ituring na may priyoridad"</string>
+    <string name="app_notification_priority_title" msgid="5949923919607295595">"Ituring na priyoridad"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Marinig ang mga notification ng app na ito kapag nakatakda sa May priyoridad lang ang Huwag istorbohin"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Payagan ang pagpi-peek"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Hayaan ang app na ito na bigyang-diin ang ilang notification sa pamamagitan ng pag-slide sa mga iyon nang panandalian sa view sa kasalukuyang screen"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Hayaan ang app na ito na bigyang-diin ang ilang notification sa pamamagitan ng pag-slide sa mga ito nang panandalian sa view sa kasalukuyang screen"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Itago ang sensitibong content"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Kapag naka-lock ang device, itago ang content sa mga notification ng app na ito na maaaring magsiwalat ng pribadong impormasyon"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Naka-block"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (na) app ang naka-install, kasama na ang system at mga na-download na app"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5938ad5..e2d515b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bu simgeyi her gördüğünüzde, bir satın alma işlemini tanımlamak veya satın alma işlemine onay vermek için parmak izinizi kullanabilirsiniz."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Ekle"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Sonraki"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Parmak izinin tümü algılanamadı. Lütfen tekrar deneyin."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Parmak izi sensörü kirli. Lütfen temizleyin ve tekrar deneyin."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Parmak hareketi çok hızlıydı. Lütfen tekrar deneyin."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Parmak hareketi çok yavaştı. Lütfen tekrar deneyin."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"İşlenemedi. Tekrar deneyin."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Donanım kullanılamıyor."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Parmak izi depolanamıyor. Lütfen mevcut parmak izlerinden birini kaldırın."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Parmak izi için zaman aşımı oluştu. Tekrar deneyin."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonu şifreleme"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Kablosuz tercih edildi (Hücresel ağ, yalnızca kablosuz ağ olmadığında kullanılır)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Hücresel ağ tercih edildi (Kablosuz bağlantı, yalnızca hücresel ağ mevcut değilse kullanılır)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Yalnızca kablosuz (Hücresel ağ asla kullanılmaz. Kablosuz ağ yoksa çağrı yapılamaz veya alınamaz)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Dolaşımdayken WFC aktarımı"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Dolaşımdayken kablosuz sesli çağrıları hücresel ağa aktarmaya izin ver"</string>
     <string name="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Konumu belirlemek için GPS, Kablosuz ve hücresel ağlar kullanılır"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Konumu belirlemek için Kablosuz ve hücresel ağlar kullanılır"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Konumu belirlemek için GPS\'yi kullan"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Tarama"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tarama"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Kablosuz ve hücresel 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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"OEM kilit açma özelliğini etkinleştirmek için cihazınızın PIN kodunu girin."</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"OEM kilit açmaya izin verilsin mi?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"UYARI: Bu ayar açıkken cihaz koruma özellikleri bu cihazda çalışmayacaktır."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Günlük Kaydedici arabellek boyutları"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Günlük arabelleği başına Günlük Kaydedici boyutlarını seçin"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Görünüm özelliği incelemeyi etkinleştir"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ağ işlemleri"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Kablosuz Ayrıntılı Günlük Kaydını etkinleştir"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Kablosuz\'dan Hücresel Ağa agresif geçiş"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Kablosuz Dolaşım Taramalarına daima izin ver"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Eski DHCP istemcisini kullan"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Kablosuz görüntüleme sertifikası seçeneklerini göster"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Kablosuz günlük kaydı seviyesini artırın. Kablosuz Seçici\'de her bir SSID RSSI için gösterin"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Etkinleştirildiğinde, Kablosuz ağ sinyali zayıfken veri bağlantısının Hücresel ağa geçirilmesinde daha agresif olunur"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Görünüm özelliği incelemeyi etkinleştir"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yeni Android DHCP istemcisi yerine Lollipop DHCP istemcisini kullanın."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB hata ayıklaması yalnızca geliştirme amaçlıdır. Verileri bilgisayarınızla cihazınız arasında kopyalamak, bildirim göndermeksizin uygulamaları cihazınıza yüklemek ve günlük verilerini okumak için kullanın."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Daha önce yetki verdiğiniz tüm bilgisayarların USB hata ayıklama erişimini iptal etmek istiyor musunuz?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi kablosuz ağ bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"kısa mesaj yazma mesajlar mesajlaşma"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"hücresel hücre operatör kablosuz veri 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"kablosuz wi-fi çağrı telefon etme dolaşım aktarma"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"kablosuz kablosuz çağrı telefon etme"</string>
     <string name="keywords_home" msgid="3626170808219458848">"başlatıcı"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran dokunmatik ekran"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"karartma ekran dokunmatik ekran pil"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Sistem uygulamaları ve indirilen uygulamalar dahil olmak üzere <xliff:g id="COUNT">%d</xliff:g> uygulama yüklendi"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7df6339..09b87c4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -366,14 +366,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Цей значок означає, що ви можете підтвердити свою особу або покупку за допомогою цифрового відбитка."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Додати"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далі"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Відбиток пальця розпізнано частково. Повторіть спробу."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Датчик цифрових відбитків забруднився. Очистьте його та повторіть спробу."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Ви зашвидко забрали палець. Повторіть спробу."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Ви не забрали палець вчасно. Повторіть спробу."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Не вдалось обробити. Повторіть спробу."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Апаратне забезпечення недоступне."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Не вдалося зберегти цифровий відбиток. Видаліть наявний."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Час очікування минув. Повторіть спробу."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрування"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрувати телефон"</string>
@@ -767,8 +759,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi за умовчанням (мобільна мережа використовується, лише якщо немає доступу до Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Мобільна мережа за умовчанням (Wi-Fi використовується, лише якщо немає доступу до мобільної мережі)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Лише Wi-Fi (мобільна мережа не використовується; якщо немає доступу до Wi-Fi, телефонувати не можна)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Переадрес. з Wi-Fi у роумінгу"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Дозволити переадресацію голосових дзвінків із Wi-Fi на мобільні мережі в роумінгу"</string>
     <string name="home_settings" msgid="212375129455718176">"Головний екран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1137,10 +1127,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Використовувати GPS, Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Використовувати Wi‑Fi і мобільні мережі для визначення місцезнаходження"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Використовувати GPS для визначення місцезнаходження"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Пошук"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Пошук"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Локація Wi‑Fi і моб. мереж"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -1470,10 +1458,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Щоб увімкнути розблокування OEM, введіть PIN-код пристрою"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дозволити виробникові розблоковувати пристрій?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ЗАСТЕРЕЖЕННЯ. Функції захисту пристрою не працюватимуть, поки ввімкнено це налаштування."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Розміри буфера журналу"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Виберіть розміри буфера журналу"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Увімкнути оцінку атрибуції переглядів"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Мережі"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифікація бездротового екрана"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Докладний запис у журнал Wi-Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Перемикатись із Wi-Fi на моб. мережу"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Завжди дозволяти Wi-Fi шукати роумінг"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Використовувати старий клієнт DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показати параметри сертифікації бездротового екрана"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Показувати в журналі RSSI для кожного SSID під час вибору Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Примусово перемикатися на мобільну мережу, коли сигнал Wi-Fi слабкий"</string>
@@ -1485,6 +1480,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Увімкнути оцінку атрибуції переглядів"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Використовувати клієнт DHCP з Lollipop, а не новий клієнт DHCP з Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Налагодження USB застосовується лише з метою розробки. Його можна використовувати для копіювання даних між комп’ютером і пристроєм, встановлення програм на вашому пристрої без сповіщення та читання даних журналу."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Скасувати доступ до налагодження USB для всіх комп’ютерів, які раніше отримали таке право?"</string>
@@ -2385,7 +2381,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"текстове повідомлення писати текстові повідомлення обмін повідомленнями"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"стільниковий мобільний оператор бездротові мережі дані 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi дзвінок телефонувати роумінг переадресація"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi дзвінок телефонувати"</string>
     <string name="keywords_home" msgid="3626170808219458848">"панель запуску"</string>
     <string name="keywords_display" msgid="6709007669501628320">"сенсорний екран дисплея"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"затемнити дисплей сенсорний екран акумулятор"</string>
@@ -2482,7 +2478,7 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Вважати пріоритетними"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Дозволити сигнал для сповіщень цього додатка, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Дозволити короткий показ"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволити цьому додатку недовго показувати важливі сповіщення на поточному екрані"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Дозволити цьому додатку ненадовго виводити важливі сповіщення на поточний екран"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ховати конфіденційний вміст"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Коли пристрій заблоковано, ховати конфіденційний вміст сповіщень цього додатка"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблоковано"</string>
@@ -2589,4 +2585,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Встановлено додатків (зокрема системних і завантажених): <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 023a1ac..55f21a0 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -350,7 +350,7 @@
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"فنگر پرنٹ سیٹ اپ"</string>
     <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"آپ کی اسکرین کو غیر مقفل کرنے یا خریداریوں کی توثیق کرنے کیلئے آپ کے فنگر پرنٹ کا استعمال کرنے کیلئے، ہمیں یہ کرنے کی ضرورت ہوگی: \n\n✓ آپ کے بیک اپ اسکرین لاک کے طریقہ کو ترتیب دینا \n\n✓ آپ کا فنگر پرنٹ شامل کرنا"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"سینسر تلاش کریں"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"اپنے فون کی پشت پر فنگر پرنٹ سینسر پتا لگائیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"اپنے فون کی پشت پر فنگر پرنٹ سینسر کا پتا لگائیں۔"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ٹھیک ہے"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"حذف کریں"</string>
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"آپ کو جب بھی یہ آئیکن دکھائی دیتا ہے تو آپ شناخت کرنے یا خریداری کی توثیق کرنے کیلئے اپنا فنگر پرنٹ استعمال کر سکتے ہیں۔"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"شامل کریں"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"آگے جائیں"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"جزوی فنگر پرنٹ کی شناخت ہوئی۔ براہ کرم دوبارہ کوشش کریں۔"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"فنگر پرنٹ سینسر گندا ہے۔ براہ کرم صاف کریں اور دوبارہ کوشش کریں۔"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"انگلی کو کافی تیزی سے ہٹا لیا گیا۔ براہ کرم دوبارہ کوشش کریں۔"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"انگلی کو بہت آہستہ ہٹایا گیا۔ براہ کرم دوبارہ کوشش کریں۔"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"کارروائی کرنے سے قاصر ہے۔ دوبارہ کوشش کریں۔"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"ہارڈ ویئر دستیاب نہیں ہے۔"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"فنگر پرنٹ اسٹور نہیں کیا جا سکتا ہے۔ براہ کرم ایک موجودہ فنگر پرنٹ ہٹائیں۔"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"فنگر پرنٹ کی میعاد ختم ہوگئی۔ دوبارہ کوشش کریں۔"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"مرموز کاری"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ٹیبلٹ کی مرموز کاری کریں"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"فون کی مرموز کاری کریں"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi ترجیحی (Wi-Fi دستیاب نہ ہونے پر ہی سیل نیٹ ورک کا استعمال کرتا ہے)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏سیلولر ترجیحی (سیل نیٹ ورک دستیاب نہ ہونے پر ہی Wi-Fi استعمال کرتا ہے)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏صرف Wi-Fi (کبھی بھی سیل نیٹ ورک استعمال نہیں کرتا ہے۔ Wi-Fi دستیاب نہ ہونے پر کالز کرنا یا موصول کرنا ممکن نہیں ہے)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"‏رومنگ کے دوران WFC ہینڈ آف"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"‏رومنگ میں رہتے ہوئے سیل نیٹ ورک پر Wi-Fi صوتی کالز کے ہینڈ آف کی اجازت دیں"</string>
     <string name="home_settings" msgid="212375129455718176">"ہوم"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"‏مقام کا تعین کرنے کیلئے GPS, Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"‏مقام کا تعین کرنے کیلئے Wi‑Fi اور سیلولر نیٹ ورکس کا استعمال کریں"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏مقام کا تعین کرنے کیلئے GPS استعمال کریں"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"اسکین کر رہا ہے"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"اسکین کر رہا ہے"</string>
     <string name="location_network_based" msgid="6010456018401296590">"‏Wi‑Fi و سیلولر نیٹ ورک کا مقام"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"‏اپنے مقام کا تیزی سے اندازہ لگانے کیلئے ایپس کو Google کی مقام کی سروس کا استعمال کرنے دیں۔ گمنام مقام کا ڈیٹا جمع کیا جائے گا اور Google کو بھیجا جائے گا۔"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏Wi‑Fi کے ذریعہ مقام کا تعین کیا گیا"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"‏OEM اَن لاک کو فعال کرنے کیلئے اپنے آلے کا PIN درج کریں۔"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"‏OEM اَن لاکنگ کی اجازت دیں؟"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"انتباہ: یہ ترتیب آن ہونے پر آلہ کے تحفظ کی خصوصیات اس آلہ پر کام نہیں کریں گی۔"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"لاگر بفر کے سائز"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"فی لاگ بفر لاگر کے سائز منتخب کریں"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"فرضی مقامات کی اجازت دیں"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"فرضی مقامات کی اجازت دیں"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"منظر انتساب کے معائنہ کو فعال کریں"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"نیٹ ورکنگ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"وائرلیس ڈسپلے سرٹیفیکیشن"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"‏Wi‑Fi وربوس لاگنگ فعال کریں"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"‏جارحانہ Wi‑Fi سے سیلولر ہینڈ اوور"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"‏ہمیشہ Wi‑Fi روم اسکینز کی اجازت دیں"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"‏پرانا DHCP کلائنٹ استعمال کریں"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"وائرلیس ڈسپلے سرٹیفیکیشن کیلئے اختیارات دکھائیں"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"‏Wi‑Fi لاگنگ لیول میں اضافہ کریں، Wi‑Fi منتخب کنندہ میں فی SSID RSSI دکھائیں"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"‏فعال ہونے پر، جب Wi‑Fi سگنل کمزور ہوگا تو Wi‑Fi سیلولر پر ڈیٹا کنکشن بھیجنے کیلئے مزید جارحانہ کاروائی کرے گا۔"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"فرضی مقامات کی اجازت دیں"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"فرضی مقامات کی اجازت دیں"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"منظر انتساب کے معائنہ کو فعال کریں"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"‏نئے Android DHCP کلائنٹ کی بجائے Lollipop کا DHCP کلائنٹ استعمال کریں۔"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏USB ڈیبگ کرنے کی اجازت دیں؟"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"‏USB ڈیبگ کرنا صرف ڈیولپمنٹ کے مقاصد کیلئے ہے۔ اپنے کمپیوٹر اور اپنے آلہ کے درمیان ڈیٹا کاپی کرنے کیلئے اسے استعمال کریں، بغیر اطلاع کے اپنے آلہ پر ایپس انسٹال کریں اور لاگ ڈیٹا پڑھیں۔"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"‏اپنے ذریعہ پہلے سے اجازت یافتہ سبھی کمپیوٹرز سے USB ڈیبگ کرنے کی رسائی کو کالعدم کریں؟"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi نیٹ ورک کنکشن"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"متنی پیغام پیغام بھیجنا پیغام رسانی"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"‏سیلولر سیل کیریئر وائرلیس ڈیٹا 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"‏wifi wi-fi کال کالنگ رومنگ ہینڈ آف"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"‏wifi wi-fi کال کالنگ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"لانچر"</string>
     <string name="keywords_display" msgid="6709007669501628320">"اسکرین ٹچ اسکرین"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"مدھم اسکرین ٹچ اسکرین بیٹری"</string>
@@ -2458,7 +2454,7 @@
     <string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"اس ایپ سے کبھی بھی اطلاعات نہ دکھائیں"</string>
     <string name="app_notification_priority_title" msgid="5949923919607295595">"ترجیح کے بطور خیال کریں"</string>
-    <string name="app_notification_priority_summary" msgid="242979561927455238">"جب صرف ڈسٹرب نہ کریں ترجیحی پر سیٹ ہو تو اس ایپ کی اطلاعات کی آواز تیز رکھنے دیں"</string>
+    <string name="app_notification_priority_summary" msgid="242979561927455238">"جب ڈسٹرب نہ کریں صرف ترجیحی پر سیٹ ہو تو اس ایپ کی اطلاعات کی آواز سنائی دینے دیں"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"جھانکنے کی اجازت دیں"</string>
     <string name="app_notification_peekable_summary" msgid="678845517890921158">"موجودہ اسکرین پر کچھ اطلاعات کو تھوڑی دیر کیلئے منظر میں سلائیڈ کرکے اس ایپ کو ان پر توجہ مرکوز کرنے دیں"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"حساس مواد چھپائیں"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"سسٹم اور ڈاؤن لوڈ کردہ ایپس سمیت <xliff:g id="COUNT">%d</xliff:g> ایپس انسٹال ہوگئیں"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 07aa637..6a82eea 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ushbu belgi ko‘rinsa, siz identifikatsiya yoki xaridni ma’qullash uchun barmoq izidan foydalanishingiz mumkin."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Qo‘shish"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Keyingi"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Barmoq izi qisman aniqlandi. Qaytadan urinib ko‘ring."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Barmoq izi sensori kirlangan. Uni tozalab, keyin qaytadan urining."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Barmoq juda tez harakatlandi. Qaytadan urinib ko‘ring."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Barmoq juda sekin harakatlandi. Qaytadan urinib ko‘ring."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Barmoq izini aniqlab bo‘lmadi. Qaytadan urining."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Barmoq izi sensoridan foydalanib bo‘lmaydi."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Barmoq izini saqlab bo‘lmadi. Mavjud barmoq izlaridan birini o‘chirib tashlang."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Barmoq izi vaqti tugab qoldi. Qaytadan urining."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Planshetni shifrlash"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonni shifrlash"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi afzal ko‘rilsin (Wi-Fi mavjud bo‘lmasa, mobil tarmoqdan foydalaniladi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobil tarmoq afzal ko‘rilsin (agar mobil tarmoq mavjud bo‘lmasa, Wi-Fi tarmog‘idan foydalaniladi)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Faqat Wi-Fi (Mobil tarmoqdan hech qachon foydalanilmaydi. Wi-Fi tarmoq mavjud bo‘lmasa, qo‘ng‘iroq qilib bo‘lmaydi va qo‘ng‘iroqlarni qabul qilib ham bo‘lmaydi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Roumingda WFC yo‘naltirish"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Roumingda mobil tarmoqqa Wi-Fi qo‘ng‘iroqlariga yo‘naltirishga ruxsat berilsin"</string>
     <string name="home_settings" msgid="212375129455718176">"Uyga"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displey"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Joylashuvni aniqlash uchun GPS, Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Joylashuvni aniqlash uchun Wi‑Fi va mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Tekshirish"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Tekshirilmoqda"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi va mobil tarmoq"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Joylashuvingizni tezroq aniqlash uchun ilovalarga Google joylashuv xizmatlaridan foydalanishga ruxsat berish. Joylashuv haqida anonim ma‘lumot to‘planib, Google‘ga yuboriladi."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi orqali aniqlangan joylashuv"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"“OEM qulfini yechish” funksiyasini yoqish uchun qurilmangiz PIN kodini kiriting"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"“OEM qulfini yechish” funksiyasi yoqilsinmi?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"OGOHLANTIRISH: Ushbu funksiya yoqilsa, qurilmani himoyalash funksiyasi ishlamay qoladi."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Jurnal buferi hajmi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Jurnal buferi hajmini tanlang"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Qo‘lbola joylashuvlarga ruxsat berish"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Joylashuv emulyatsiyasiga ruxsat berish"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Tekshiruv alomatlarini ko‘rish funksiyasini yoqish"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Tarmoqlar"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Displeyning simsiz sertifikatsiyasi"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi jurnalidagi batafsil ma’lumot"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi’dan mob. internetga majburiy o‘tish"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi rouming tekshiruviga doim ruxsat berilsin"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Amaldagi DHCP mijoz-dasturidan foydalanish"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Displeyning simsiz sertifikatsiyasi uchun tanlamalarni ko‘rsatish"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi ulanishini tanlashda har bir SSID uchun jurnalda ko‘rsatilsin"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Agar ushbu funksiya yoqilsa, Wi-Fi signali past bo‘lganda internetga ulanish majburiy ravishda mobil internetga o‘tkaziladi."</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Qo‘lbola joylashuvlarga ruxsat berish"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Joylashuv emulyatsiyasiga ruxsat berish"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Tekshiruv alomatlarini ko‘rish funksiyasini yoqish"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Yangi Android DHCP mijoz-dasturi o‘rniga Lollipop tizimi DHCP mijoz-dasturidan foydalanilsin."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB nosozliklarni tuzatishga ruxsat berilsinmi?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB nosozliklarni tuzatish faqat dasturlash maqsadlarida yoqiladi. Undan ma‘lumotlarni qurilmangiz va kompyuter o‘rtasida ko‘chirish, ilovalarni xabarnomasiz o‘rnatish va jurnal ma‘lumotlarini o‘qish uchun foydalaniladi."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Oldinroq USB orqali nosozliklarni tuzatishga berilgan ruxsat barcha kompyuterlar uchun bekor qilinsinmi?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi tarmoq ulanishi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"matn, xabar, xabarlashuv, xabarlar"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"uyali, uyali aloqa operatori, simsiz internet, 4g, 3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi qo‘ng‘iroq qo‘ng‘iroq qilish rouming qo‘ng‘roqlarni qayta yo‘naltirish"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wi-fi qo‘ng‘iroqlar"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ishga tushirish paneli"</string>
     <string name="keywords_display" msgid="6709007669501628320">"ekran tegish ekrani"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"xira, ekran, sensorli ekran, batareya"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ta ilova o‘rnatilgan, jumladan, tizimga oid va yuklab olingan ilovalar"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 53eea2a..0cf3007 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -348,7 +348,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vân tay được đăng ký</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"Thiết lập vân tay"</string>
-    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Để sử dụng vân tay của bạn để mở khóa màn hình hoặc xác nhận mua hàng, chúng tôi cần phải: \n\n✓ Thiệt lập phương pháp khóa màn hình sao lưu của bạn \n\n✓ Thêm vân tay của bạn"</string>
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"Để sử dụng vân tay của bạn để mở khóa màn hình hoặc xác nhận mua hàng, chúng tôi cần phải: \n\n✓ Thiết lập phương pháp khóa màn hình sao lưu của bạn \n\n✓ Thêm vân tay của bạn"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tìm cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tìm cảm biến vân tay trên mặt sau điện thoại của bạn."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Tên"</string>
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Bất cứ khi nào nhìn thấy biểu tượng này, bạn có thể sử dụng vân tay của mình để nhận dạng hoặc ủy quyền mua hàng."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Thêm"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Đã phát hiện được một phần vân tay. Vui lòng thử lại."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Cảm biến vân tay bị bẩn. Hãy làm sạch và thử lại."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Ngón tay đã di chuyển quá nhanh. Vui lòng thử lại."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Ngón tay đã di chuyển quá chậm. Vui lòng thử lại."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Không thể xử lý. Hãy thử lại."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Phần cứng không có sẵn."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Không thể lưu vân tay. Vui lòng xóa vân tay hiện có."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Đã hết thời gian chờ vân tay. Hãy thử lại."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa điện thoại"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Ưu tiên Wi-Fi (Chỉ sử dụng mạng di động nếu không có Wi-Fi)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Ưu tiên mạng di động (Chỉ sử dụng Wi-Fi nếu không có mạng di động)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Chỉ Wi-Fi (Không bao giờ sử dụng mạng di động. Không thể nhận hoặc thực hiện cuộc gọi nếu không có Wi-Fi)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Chuyển WFC khi chuyển vùng"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Cho phép chuyển cuộc gọi thoại qua Wi-Fi sang mạng di động khi chuyển vùng"</string>
     <string name="home_settings" msgid="212375129455718176">"Trang chủ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sử dụng mạng GPS, Wi-Fi và di động để xác định vị trí"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sử dụng mạng di động và Wi-Fi để xác định vị trí"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sử dụng GPS để xác định vị trí"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Đang quét"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Đang quét"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Vị trí mạng di động và Wi‑Fi"</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>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Nhập mã PIN thiết bị của bạn để bật tính năng mở khóa OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Cho phép mở khóa OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"CẢNH BÁO: Tính năng Bảo vệ thiết bị sẽ không hoạt động trên thiết bị này trong khi bạn bật cài đặt này."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Kích cỡ tải trình ghi"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chọn k.cỡ Trình ghi/lần tải n.ký"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Cho phép kiểm tra thuộc tính của chế độ xem"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Mạng"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Bật ghi nhật ký chi tiết Wi‑Fi"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Chuyển vùng Wi‑Fi tích cực sang mạng DĐ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Luôn cho phép quét chuyển vùng Wi‑Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Sử dụng ứng dụng DHCP cũ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Hiển thị tùy chọn chứng nhận hiển thị không dây"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Tăng mức ghi nhật ký Wi‑Fi, hiển thị mỗi SSID RSSI trong bộ chọn Wi‑Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Khi được bật, Wi‑Fi sẽ tích cực hơn trong việc chuyển vùng kết nối dữ liệu sang mạng di động khi tín hiệu Wi‑Fi yếu"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Cho phép kiểm tra thuộc tính của chế độ xem"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sử dụng ứng dụng DHCP từ Lollipop thay vì ứng dụng DHCP mới của Android."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Gỡ lỗi USB chỉ dành cho mục đích phát triển. Hãy sử dụng tính năng này để sao chép dữ liệu giữa máy tính và thiết bị của bạn, cài đặt ứng dụng trên thiết bị của bạn mà không thông báo và đọc dữ liệu nhật ký."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Thu hồi quyền truy cập gỡ lỗi USB từ tất cả máy tính mà bạn đã ủy quyền trước đó?"</string>
@@ -2367,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi kết nối mạng"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"tin nhắn văn bản nhắn tin tin nhắn nhắn tin"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"di động điện thoại nhà cung cấp không dây dữ liệu 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi gọi gọi điện chuyển vùng chuyển"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"gọi điện qua Wi-Fi"</string>
     <string name="keywords_home" msgid="3626170808219458848">"trình chạy"</string>
     <string name="keywords_display" msgid="6709007669501628320">"màn hình màn hình cảm ứng"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"làm mờ màn hình màn hình cảm ứng pin"</string>
@@ -2392,8 +2388,8 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"tài khoản"</string>
     <string name="keywords_users" msgid="4673901601478559100">"hạn chế hạn chế bị hạn chế"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sửa văn bản sửa âm thanh rung tự động ngôn ngữ cử chỉ đề xuất đề xuất chủ đề từ xúc phạm nhập biểu tượng cảm xúc quốc tế"</string>
-    <string name="keywords_reset_apps" msgid="6420313678620788457">"đặt lại mặc định tùy chọn"</string>
-    <string name="keywords_all_apps" msgid="5377153522551809915">"hệ thống ứng dụng tải xuống ứng dụngapps download applications system"</string>
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"đặt lại tùy chọn về mặc định"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"hệ thống ứng dụng tải xuống ứng dụng"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"trượt mật khẩu hình mẫu mã pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
@@ -2460,7 +2456,7 @@
     <string name="app_notification_priority_title" msgid="5949923919607295595">"Coi là ưu tiên"</string>
     <string name="app_notification_priority_summary" msgid="242979561927455238">"Bật âm cho thông báo của ứng dụng này khi Không làm phiền được đặt thành Chỉ ưu tiên"</string>
     <string name="app_notification_peekable_title" msgid="8647856880382324822">"Cho phép xem nhanh"</string>
-    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Cho phép ứng dụng này nhấn mạnh các thông báo nhất định bằng cách trượt nhanh các thông báo đó vào chế độ xem trên màn hình hiện tại"</string>
+    <string name="app_notification_peekable_summary" msgid="678845517890921158">"Cho phép ứng dụng này nhấn mạnh các thông báo nhất định bằng cách trượt nhanh chúng vào chế độ xem trên màn hình hiện tại"</string>
     <string name="app_notification_sensitive_title" msgid="8465860579482264139">"Ẩn nội dung nhạy cảm"</string>
     <string name="app_notification_sensitive_summary" msgid="8433315579173105209">"Khi thiết bị bị khóa, hãy ẩn nội dung có thể tiết lộ thông tin cá nhân trong thông báo của ứng dụng này"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bị chặn"</string>
@@ -2565,4 +2561,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"Đã cài đặt <xliff:g id="COUNT">%d</xliff:g> ứng dụng, bao gồm các ứng dụng đã tải xuống và ứng dụng hệ thống"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e124708..d301fe9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -348,8 +348,7 @@
       <item quantity="one">已注册 <xliff:g id="COUNT_0">%1$d</xliff:g> 个指纹</item>
     </plurals>
     <string name="security_settings_fingerprint_enroll_onboard_title" msgid="4735546436672054254">"指纹设置"</string>
-    <!-- no translation found for security_settings_fingerprint_enroll_onboard_message (1892198885652894680) -->
-    <skip />
+    <string name="security_settings_fingerprint_enroll_onboard_message" msgid="1892198885652894680">"要使用指纹解锁屏幕或确认购买交易,您需要:\n\n✓ 设置您的备用屏幕锁定方式\n\n✓ 添加您的指纹"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"寻找传感器"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"您可以在手机背面找到指纹传感器。"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"名称"</string>
@@ -363,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要您看见此图标,就可以使用指纹进行身份验证或对购买交易进行授权。"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"添加"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"仅检测到部分指纹,请重试。"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"指纹传感器有脏污。请擦拭干净,然后重试。"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"手指移动太快,请重试。"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"手指移动太慢,请重试。"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"无法处理指纹,请重试。"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"硬件无法使用。"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"无法存储指纹。请移除一个现有的指纹。"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"指纹录入操作超时,请重试。"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
@@ -752,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"首选 WLAN(只有 WLAN 不可用时才使用移动网络)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"首选移动网络(只有移动网络不可用时才使用 WLAN)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"仅限 WLAN(始终不使用移动网络。如果 WLAN 不可用,则无法拨打或接听电话)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"漫游时进行 WFC 切换"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"漫游时允许从 WLAN 语音通话切换为移动网络"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -1120,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用GPS、WLAN和移动网络确定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用WLAN和移动网络确定位置"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 确定位置"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"扫描"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</string>
     <string name="location_network_based" msgid="6010456018401296590">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过WLAN确定位置"</string>
@@ -1453,10 +1440,19 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"输入您的设备 PIN 码即可启用 OEM 解锁"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允许 OEM 解锁吗?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告:如果开启此设置,此设备上的设备保护功能将无法使用。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"日志记录器缓冲区大小"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"选择每个日志缓冲区的日志记录器大小"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"启用视图属性检查功能"</string>
+    <!-- no translation found for debug_networking_category (7044075693643009662) -->
+    <skip />
     <string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"启用WLAN详细日志记录功能"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"主动从WLAN网络切换到移动数据网络"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"一律允许WLAN漫游扫描"</string>
+    <!-- no translation found for legacy_dhcp_client (694426978909127287) -->
+    <skip />
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"显示无线显示认证选项"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"提升WLAN日志记录级别(在WLAN选择器中显示每个SSID的RSSI)"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"开启此设置后,系统会在WLAN信号较弱时,主动将网络模式从WLAN网络切换到移动数据网络"</string>
@@ -1468,6 +1464,8 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"启用视图属性检查功能"</string>
+    <!-- no translation found for legacy_dhcp_client_summary (163383566317652040) -->
+    <skip />
     <string name="adb_warning_title" msgid="6234463310896563253">"是否允许USB调试?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB调试仅适用于开发工作。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用而不发送通知以及读取日志数据。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"是否针对您之前授权的所有计算机撤消USB调试的访问权限?"</string>
@@ -2368,7 +2366,8 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"WLAN网络连接"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"短信 信息 发短信 消息 发送消息"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"蜂窝网络 手机运营商 无线 移动网络 数据网络 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"Wi-Fi WLAN 呼叫 通话 漫游 切换"</string>
+    <!-- no translation found for keywords_wifi_calling (5497735076883598019) -->
+    <skip />
     <string name="keywords_home" msgid="3626170808219458848">"启动器 桌面"</string>
     <string name="keywords_display" msgid="6709007669501628320">"屏幕 触摸屏"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"变暗 调暗 屏幕 触摸屏 电池"</string>
@@ -2393,10 +2392,8 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"帐户"</string>
     <string name="keywords_users" msgid="4673901601478559100">"限制 受限"</string>
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
-    <!-- no translation found for keywords_reset_apps (6420313678620788457) -->
-    <skip />
-    <!-- no translation found for keywords_all_apps (5377153522551809915) -->
-    <skip />
+    <string name="keywords_reset_apps" msgid="6420313678620788457">"重置 偏好设置 默认"</string>
+    <string name="keywords_all_apps" msgid="5377153522551809915">"应用 下载 应用程序 系统"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
@@ -2557,25 +2554,17 @@
     </plurals>
     <string name="launch_defaults_some" msgid="313159469856372621">"已设置部分默认选项"</string>
     <string name="launch_defaults_none" msgid="4241129108140034876">"未设置任何默认选项"</string>
-    <!-- no translation found for filter_all_apps (1988403195820688644) -->
-    <skip />
-    <!-- no translation found for filter_enabled_apps (3318021007093070639) -->
-    <skip />
-    <!-- no translation found for filter_personal_apps (3277727374174355971) -->
-    <skip />
-    <!-- no translation found for filter_work_apps (24519936790795574) -->
-    <skip />
-    <!-- no translation found for filter_notif_blocked_apps (3446926933792244485) -->
-    <skip />
-    <!-- no translation found for filter_notif_priority_apps (5965001885749195239) -->
-    <skip />
-    <!-- no translation found for filter_notif_sensitive_apps (412490487743581673) -->
-    <skip />
-    <!-- no translation found for reset_app_preferences_description (7718912868244058770) -->
-    <skip />
-    <!-- no translation found for all_apps_summary (3754827293203127282) -->
-    <skip />
-    <!-- no translation found for advanced_apps (4812975097124803873) -->
-    <skip />
+    <string name="filter_all_apps" msgid="1988403195820688644">"所有应用"</string>
+    <string name="filter_enabled_apps" msgid="3318021007093070639">"已启用"</string>
+    <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
+    <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
+    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已屏蔽"</string>
+    <string name="filter_notif_priority_apps" msgid="5965001885749195239">"优先"</string>
+    <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"含敏感信息"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"将所有应用的偏好设置重置为默认设置"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"已安装 <xliff:g id="COUNT">%d</xliff:g> 个应用(包括系统和下载的应用)"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
+    <!-- no translation found for choose_profile (8229363046053568878) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3c79ac9..b648226 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"如果看到這個圖示,您可以使用您的指紋加以識別或授權購買。"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"加入"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"只偵測到部分指紋。請再試一次。"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"指紋感應器不乾淨。請清潔後再試一次。"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"手指移動太快。請再試一次。"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"手指移動太慢。請再試一次。"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"無法處理。請再試一次。"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"硬件無法使用。"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"指紋無法儲存。請移除現有指紋。"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"指紋已逾時。請再試一次。"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對平板電腦進行加密"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"首選 Wi-Fi (只在無法使用 Wi-Fi 時使用流動網絡)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"首選流動數據 (只在無法使用流動網絡時使用 Wi-Fi)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"只限 Wi-Fi (永不使用流動網絡。如果無法使用 Wi-Fi,則無法撥打或接聽電話)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"WFC 漫遊轉接"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"允許 Wi-Fi 語音通話在漫遊時轉接至流動網絡"</string>
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和流動網絡確定位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和流動網絡確定位置"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 確定位置"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"正在掃瞄"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"正在掃瞄"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和流動網絡位置資料"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的位置資訊服務,藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 確定位置"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"請輸入您的裝置 PIN,以啟用原始設備製造商 (OEM) 解鎖"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"允許原始設備製造商 (OEM) 解鎖嗎?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告:這項設定開啟時,這部裝置上的裝置保護功能將無法運作。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"記錄器緩衝區空間"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個記錄緩衝區的記錄器空間"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"網絡"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細記錄"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"加強 Wi-Fi 至流動數據轉換"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"永遠允許 Wi-Fi 漫遊掃瞄"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"使用舊的 DHCP 用戶端"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"讓 Wi‑Fi 記錄功能升級,在 Wi‑Fi 選擇器中依每個 SSID RSSI 顯示 Wi‑Fi 詳細紀錄"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"啟用時,Wi-Fi 連線會在訊號不穩的情況下更積極轉換成流動數據連線"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端而不是新的 Android DHCP 用戶端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能,可讓您在電腦與裝置間複製資料、不用通知即可在裝置上安裝應用程式,以及讀取記錄資料。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"要針對先前授權的所有電腦撤銷 USB 偵錯存取權嗎?"</string>
@@ -2371,7 +2367,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"WiFi Wi-Fi 網絡連線"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送短訊"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"流動網絡 手機網絡 流動網絡供應商 無線 網絡數據 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"WiFi Wi-Fi 通話 正在撥號 漫遊 轉接"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"WiFi Wi-Fi 通話 撥號中"</string>
     <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
@@ -2565,8 +2561,9 @@
     <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"已封鎖"</string>
     <string name="filter_notif_priority_apps" msgid="5965001885749195239">"重要"</string>
     <string name="filter_notif_sensitive_apps" msgid="412490487743581673">"敏感"</string>
-    <string name="reset_app_preferences_description" msgid="7718912868244058770">"重設所有應用程式的偏好設定到預設值"</string>
+    <string name="reset_app_preferences_description" msgid="7718912868244058770">"重設所有應用程式的偏好設定至預設值"</string>
     <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式,包括系統和已下載應用程式"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 251579a..bd9f055 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示,就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"新增"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"下一步"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"僅偵測到部分指紋,請再試一次。"</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"指紋感應器有髒汙。請清潔感應器,然後再試一次。"</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"手指移動速度過快,請再試一次。"</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"手指移動速度過慢,請再試一次。"</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"無法辨識指紋,請再試一次。"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"硬體無法使用。"</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"無法儲存指紋,請先移除現有指紋。"</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"指紋處理作業逾時,請再試一次。"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密保護平板電腦"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi 優先 (只會在無法使用 Wi-Fi 的情況下使用行動通訊網路)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"行動通訊優先 (只會在無法使用行動通訊網路的情況下使用 Wi-Fi)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"只限 Wi-Fi (一律不使用行動通訊網路。如果無法使用 Wi-Fi,則無法撥打或接聽電話)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"漫遊時轉接 Wi-Fi 通話"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"漫遊時允許 Wi-Fi 語音通話轉接到行動通訊網路"</string>
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -1119,10 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"使用 GPS、Wi-Fi 和行動網路判斷位置"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"使用 Wi-Fi 和行動網路判斷位置"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷您的所在位置"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"掃描"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃描"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi-Fi 和行動網路位置資訊"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
@@ -1452,10 +1440,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"如要啟用 OEM 解鎖設定,請輸入您的裝置 PIN"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"要允許 OEM 解鎖嗎?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"警告:開啟這項設定時,您將無法使用這個裝置的防盜功能。"</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"紀錄器緩衝區空間"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個紀錄緩衝區的紀錄器空間"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"網路連線"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"啟用 Wi‑Fi 詳細紀錄設定"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Wi-Fi 至行動數據轉換強化"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"一律允許 Wi-Fi 漫遊掃描"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"使用舊版 DHCP 用戶端"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"讓 Wi‑Fi 記錄功能升級,在 Wi‑Fi 選擇器中依每個 SSID RSSI 顯示 Wi‑Fi 詳細紀錄"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"啟用時,Wi-Fi 連線在訊號不穩的情況下會更積極轉換成行動數據連線"</string>
@@ -1467,6 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端,而不是新的 Android DHCP 用戶端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能,可讓您複製電腦和裝置中的資料、不需經由通知即可在裝置上安裝應用程式,以及讀取記錄資料。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"要針對先前授權的所有電腦撤銷 USB 偵錯權限嗎?"</string>
@@ -2371,7 +2367,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"文字訊息 訊息 傳送文字訊息 簡訊 傳送簡訊"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"行動通訊 行動網路 行動通訊業者 無線 數據 4G 3G 2G LTE"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"wifi wi-fi 通話 撥號 漫遊 轉接"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"wifi wi-fi 通話 撥號"</string>
     <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="6709007669501628320">"螢幕 觸控式螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"變暗 螢幕 觸控螢幕 電池"</string>
@@ -2569,4 +2565,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式,包括系統和下載的應用程式"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9100cf9..99f6873 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -362,14 +362,6 @@
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Noma kunini lapho ubona khona lesi sithonjana, ungasebenzisa izigxivizo zakho zeminwe noma ugunyaze ukuthenga."</string>
     <string name="fingerprint_enroll_button_add" msgid="9087063833311608281">"Engeza"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Okulandelayo"</string>
-    <string name="fingerprint_acquired_try_again" msgid="3543246847519773670">"Izigxivizo zeminwe esincane sitholiwe. Sicela uzame futhi."</string>
-    <string name="fingerprint_acquired_imager_dirty" msgid="1069333738311915876">"Inzwa yezigxivizo zeminwe ingcolile. Sicela uyihlanze uphinde uzame futhi."</string>
-    <string name="fingerprint_acquired_too_fast" msgid="4068036120000203641">"Umunwe uhanjiswe ngokushesha kakhulu. Sicela uzame futhi."</string>
-    <string name="fingerprint_acquired_too_slow" msgid="1030658686087736299">"Umunwe uhanjiswe kancane kakhulu. Sicela uzame futhi."</string>
-    <string name="fingerprint_error_unable_to_process" msgid="3695170439991347449">"Ayikwazi ukucubungula. Zama futhi."</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3535489559110151108">"Izingxenyekazi zekhompyutha azitholakali."</string>
-    <string name="fingerprint_error_no_space" msgid="7350970359618153619">"Izigxivizo zeminwe azikwazi ukugcinwa. Sicela ususe izigxivizo zeminwe ezikhona."</string>
-    <string name="fingerprint_error_timeout" msgid="7509454501138740556">"Kufinyelelwe isikhathi sokuvala sezigxivizo zeminwe. Zama futhi."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ukubethelwa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Bethela ifoni"</string>
@@ -751,8 +743,6 @@
     <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Kuncanyelwa i-Wi-Fi (Isebenzisa inethiwekhi yeselula kuphela uma ngabe i-Wi-Fi ingatholakali)"</string>
     <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Kuncanyelwa iselula (Isebenzisa i-Wi-Fi kuphela uma ngabe inethiwekhi yeselula ingatholakali)"</string>
     <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"I-Wi-Fi kuphela (Ayilokothi isebenzise inethiwekhi yeselula. Ayikwazi ukwenza noma ukuthola amakholi uma ngabe i-Wi-Fi ingatholakali)"</string>
-    <string name="wifi_calling_roam_title" msgid="1949055516180908425">"Ukunikezelwa kwe-WFC ngenkathi izula"</string>
-    <string name="wifi_calling_roam_summary" msgid="8613368213416864074">"Vumela ukunikezelwa kwamakholi we-Wi-Fi kunethiwekhi yeselula uma izula"</string>
     <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
@@ -1120,10 +1110,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Sebenzisa i-GPS, Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Sebenzisa i-Wi‑Fi namanethiwekhi weselula ukucacisa indawo"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Sebenzisa i-GPS ukuze unqume indawo"</string>
-    <!-- no translation found for location_menu_scanning (8536245838478802959) -->
-    <skip />
-    <!-- no translation found for location_scanning_screen_title (4408076862929611554) -->
-    <skip />
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Iyaskena"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Iyaskena"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Indawo ye-Wi‑Fi nenethiwekhi 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>
@@ -1459,10 +1447,17 @@
     <string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Faka i-PIN yedivayisi yakho ukuze unike amandla ukuvula kwe-OEM"</string>
     <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Vumela ukuvula i-OEM?"</string>
     <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ISEXWAYISO: Izici zokuvikela idivayisi ngeke zisebenze kule divayisi ngenkathi le sethingi ivuliwe."</string>
+    <string name="select_logd_size_title" msgid="7433137108348553508">"Amasayizi weloga ngebhafa"</string>
+    <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Khetha amasayizi weloga ngebhafa ngayinye yelogu"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
+    <string name="debug_view_attributes" msgid="6485448367803310384">"Nika amandla ukubuka"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"Ukunethiwekha"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Ukunikezwa isitifiketi sokubukeka okungenantambo"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"Nika amandlaukungena kwe-Wi-Fi Verbose"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Ukunikezela kwe-Wi-Fi kuya kuselula okunamandla"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Vumela njalo ukuskena kokuzula kwe-Wi-Fi"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"Sebenzisa iklayenti le-legacy le-DHCP"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Bonisa izinketho zokunikeza isitifiketi ukubukeka okungenantambo"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"khuphula izinga lokungena le-Wi-Fi, bonisa nge-SSID RSSI engayodwana kusikhethi se-Wi-Fi"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Uma inikwe amandla, i-Wi-Fi izoba namandla kakhulu ekunikezeleni ukuxhumeka kwedatha kuselula, uma isiginali ye-Wi-Fi iphansi"</string>
@@ -1474,6 +1469,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"Nika amandla ukubuka"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Sebenzisa iklayenti le-DHCP kusukela ku-Lollipop esikhundleni seklayenti elisha le-Android DHCP."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ukulungisa iphutha le-USB kuhloselwe izinjongo zokuthuthukisa kuphela. Ingasebenziselwa ukukopisha idatha phakathi kwekhompyutha yakho nedivaysi yakho, faka izinhlelo zokusebenza kwidivaysi yakho ngaphandle kwesaziso, bese ufunda idatha yefayela lokungena."</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"Buyisa ukufinyelela ekususeni iphutha le-USB kusuka kuwo wonke amakhompyutha owagunyaze ngaphambilini?"</string>
@@ -2374,7 +2370,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"ukuxhumeka kwenethiwekhi ye-wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"umlayezo wombhalo ukubhala imilayezo umlayezo"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"iselula iseli inkampathi yenethiwekhi idatha engenantambo  4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="3032400528043215568">"i-wifi ikholi ye-wi-fi ukunikezelwa kokuzula kokushaya"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"I-wifi wi-fi ikholi ukushaya"</string>
     <string name="keywords_home" msgid="3626170808219458848">"isiqalisi"</string>
     <string name="keywords_display" msgid="6709007669501628320">"isikrini sesikrini sokuthinta"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ibhethri lesikrini esithintwayo lokucisha isikrini"</string>
@@ -2572,4 +2568,5 @@
     <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza ezifakiwe, kufaka phakathi isistimu nezinhlelo zokusebenza ezilandekayo"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
 </resources>
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f587b60..f8db3d8 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -38,9 +38,10 @@
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import com.android.internal.logging.MetricsLogger;
 
 
-public class ApnEditor extends PreferenceActivity
+public class ApnEditor extends InstrumentedPreferenceActivity
         implements SharedPreferences.OnSharedPreferenceChangeListener,
                     Preference.OnPreferenceChangeListener {
 
@@ -228,6 +229,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APN_EDITOR;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         getPreferenceScreen().getSharedPreferences()
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 79a3825..68cfb60 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -47,6 +47,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
 import android.telephony.TelephonyManager;
@@ -125,6 +126,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APN;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Activity activity = getActivity();
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index 6a17049..9e010b6 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -24,6 +24,7 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import com.android.internal.logging.MetricsLogger;
 
 public class ApplicationSettings extends SettingsPreferenceFragment {
     
@@ -43,6 +44,11 @@
     private ListPreference mInstallLocation;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATION;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index b6f907e..6d31e60 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -42,6 +42,7 @@
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.List;
@@ -113,6 +114,11 @@
         };
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_GENERIC;
+        }
+
+        @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 0a0aebd..6d7b71d 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
@@ -96,7 +97,7 @@
         setTitle(msg);
     }
 
-    public static class ChooseLockPasswordFragment extends Fragment
+    public static class ChooseLockPasswordFragment extends InstrumentedFragment
             implements OnClickListener, OnEditorActionListener,  TextWatcher {
         private static final String KEY_FIRST_PIN = "first_pin";
         private static final String KEY_UI_STAGE = "ui_stage";
@@ -263,6 +264,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
             updateStage(mUiStage);
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 6343468..1865a6b 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
@@ -101,7 +102,7 @@
         return super.onKeyDown(keyCode, event);
     }
 
-    public static class ChooseLockPatternFragment extends Fragment
+    public static class ChooseLockPatternFragment extends InstrumentedFragment
             implements View.OnClickListener {
 
         public static final int CONFIRM_EXISTING_REQUEST = 55;
@@ -205,6 +206,11 @@
                 }
          };
 
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PATTERN;
+        }
+
 
         /**
          * The states of the left footer button.
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index c74e861..b49dc6e 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.text.TextUtils;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
@@ -74,8 +75,8 @@
         setTitle(msg);
     }
 
-    public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
-            OnEditorActionListener, TextWatcher {
+    public static class ConfirmLockPasswordFragment extends InstrumentedFragment
+            implements OnClickListener, OnEditorActionListener, TextWatcher {
         private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
                 = "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
@@ -174,6 +175,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
             // TODO Auto-generated method stub
             super.onResume();
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 87d401c..b5d444b 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
@@ -84,7 +85,7 @@
         return false;
     }
 
-    public static class ConfirmLockPatternFragment extends Fragment {
+    public static class ConfirmLockPatternFragment extends InstrumentedFragment {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
@@ -172,6 +173,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PATTERN;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
 
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 4d6f26b..77a1c45 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -33,14 +33,20 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.Locale;
 
-public class CryptKeeperConfirm extends Fragment {
+public class CryptKeeperConfirm extends InstrumentedFragment {
 
     private static final String TAG = "CryptKeeperConfirm";
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.CRYPT_KEEPER_CONFIRM;
+    }
+
     public static class Blank extends Activity {
         private Handler mHandler = new Handler();
 
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d962446..3fb60e3 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -34,8 +34,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import com.android.internal.logging.MetricsLogger;
 
-public class CryptKeeperSettings extends Fragment {
+public class CryptKeeperSettings extends InstrumentedFragment {
     private static final String TAG = "CryptKeeper";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -111,6 +112,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.CRYPT_KEEPER;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 0d21066..6e72ef7 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -127,6 +127,7 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.ChartData;
@@ -291,6 +292,11 @@
     private final Map<String, Boolean> mMobileDataEnabled = new HashMap<String, Boolean>();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DATA_USAGE_SUMMARY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Context context = getActivity();
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index be24ffe..a3926a3 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -41,6 +41,8 @@
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
+import com.android.internal.logging.MetricsLogger;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -75,6 +77,11 @@
     private Preference mDatePref;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DATE_TIME;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 192bd5c..e0091e1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -68,6 +68,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
@@ -260,6 +261,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVELOPMENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 648615a..061b133 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -37,6 +37,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
@@ -84,6 +85,11 @@
     Toast mDevHitToast;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 3358124..47cbcde 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
 import com.android.settings.DropDownPreference.Callback;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -86,6 +87,11 @@
     private SwitchPreference mAutoBrightnessPreference;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DISPLAY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Activity activity = getActivity();
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 38cba7a..8137cd4 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -43,6 +43,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DreamBackend.DreamInfo;
 import com.android.settings.widget.SwitchBar;
 
@@ -77,6 +78,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DREAM;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         logd("onCreate(%s)", icicle);
         super.onCreate(icicle);
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index dfbed77..9b6444c 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -78,6 +79,11 @@
         private boolean mPasswordRequired;
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.ENCRYPTION;
+        }
+
+        @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
             final int layoutId = R.layout.encryption_interstitial;
diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 931fb9c..c54272f 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -43,6 +43,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 /**
@@ -81,7 +82,8 @@
         setTitle(msg);
     }
 
-    public static class FingerprintEnrollFragment extends Fragment implements View.OnClickListener {
+    public static class FingerprintEnrollFragment extends InstrumentedFragment
+            implements View.OnClickListener {
         private static final String EXTRA_PROGRESS = "progress";
         private static final String EXTRA_STAGE = "stage";
         private static final int PROGRESS_BAR_MAX = 10000;
@@ -171,6 +173,11 @@
         };
         private static final boolean ALWAYS_SHOW_FIND_SCREEN = true;
 
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.FINGERPRINT_ENROLL;
+        }
+
         private enum Stage {
             EnrollingOnboard(R.string.security_settings_fingerprint_enroll_onboard_title,
                     R.string.security_settings_fingerprint_enroll_onboard_message,
diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index 857ef1f..d086ff7 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -40,6 +40,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.Indexable;
 
 import java.util.List;
@@ -148,6 +149,11 @@
         };
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.FINGERPRINT;
+        }
+
+        @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             mFingerprintManager = (FingerprintManager) getActivity().getSystemService(
diff --git a/src/com/android/settings/HighlightingFragment.java b/src/com/android/settings/HighlightingFragment.java
index 4a233b4..ef2fbf3 100644
--- a/src/com/android/settings/HighlightingFragment.java
+++ b/src/com/android/settings/HighlightingFragment.java
@@ -23,7 +23,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-public class HighlightingFragment extends Fragment {
+public abstract class HighlightingFragment extends InstrumentedFragment {
 
     private static final String TAG = "HighlightSettingsFragment";
 
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index 6da1848..22d4cdc 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -51,6 +51,7 @@
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.RadioButton;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
@@ -253,6 +254,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.HOME;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.home_selection);
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index efc5a3c..0e47afb 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -42,6 +42,7 @@
 import android.widget.TabWidget;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyIntents;
@@ -55,7 +56,7 @@
  * these operations.
  *
  */
-public class IccLockSettings extends PreferenceActivity
+public class IccLockSettings extends InstrumentedPreferenceActivity
         implements EditPinPreference.OnPinEnteredListener {
     private static final String TAG = "IccLockSettings";
     private static final boolean DBG = true;
@@ -239,6 +240,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ICC_LOCK;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
new file mode 100644
index 0000000..96b7296
--- /dev/null
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.preference.PreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented fragment that logs visibility state.
+ */
+public abstract class InstrumentedFragment extends PreferenceFragment {
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(getActivity(), getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(getActivity(), getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/InstrumentedPreferenceActivity.java b/src/com/android/settings/InstrumentedPreferenceActivity.java
new file mode 100644
index 0000000..8ad88b0
--- /dev/null
+++ b/src/com/android/settings/InstrumentedPreferenceActivity.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.preference.PreferenceActivity;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented activity that logs visibility state.
+ */
+public abstract class InstrumentedPreferenceActivity extends PreferenceActivity {
+    protected abstract int getMetricsCategory();
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MetricsLogger.visible(this, getMetricsCategory());
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(this, getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java
new file mode 100644
index 0000000..1d86102
--- /dev/null
+++ b/src/com/android/settings/InstrumentedPreferenceFragment.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.preference.PreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented preference fragment that logs visibility state.
+ */
+public abstract class InstrumentedPreferenceFragment extends PreferenceFragment {
+    protected abstract int getMetricsCategory();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MetricsLogger.visible(getActivity(), getMetricsCategory());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MetricsLogger.hidden(getActivity(), getMetricsCategory());
+    }
+}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 9480f67..1b6468f 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -41,6 +41,7 @@
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
 
 import java.util.List;
 
@@ -54,7 +55,7 @@
  *
  * This is the initial screen.
  */
-public class MasterClear extends Fragment {
+public class MasterClear extends InstrumentedFragment {
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
@@ -270,4 +271,9 @@
         establishInitialState();
         return mContentView;
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MASTER_CLEAR;
+    }
 }
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 3521aa3..bc3656a 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -21,6 +21,7 @@
 import android.content.pm.ActivityInfo;
 import android.os.AsyncTask;
 import android.service.persistentdata.PersistentDataBlockManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.storage.ExternalStorageFormatter;
 
 import android.app.Fragment;
@@ -42,7 +43,7 @@
  *
  * This is the confirmation screen.
  */
-public class MasterClearConfirm extends Fragment {
+public class MasterClearConfirm extends InstrumentedFragment {
 
     private View mContentView;
     private boolean mEraseSdCard;
@@ -144,4 +145,9 @@
         Bundle args = getArguments();
         mEraseSdCard = args != null && args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MASTER_CLEAR_CONFIRM;
+    }
 }
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index c1cacb9..54b7cab 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -29,9 +29,10 @@
 import android.widget.EditText;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
-public class OwnerInfoSettings extends Fragment {
+public class OwnerInfoSettings extends InstrumentedFragment {
 
     public static final String EXTRA_SHOW_NICKNAME = "show_nickname";
 
@@ -99,6 +100,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.OWNER_INFO;
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
         saveChanges();
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index e150298..4eb8a9e 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -37,6 +37,7 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import java.util.ArrayList;
@@ -70,6 +71,11 @@
     private int mDialogType;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRIVACY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // Don't allow any access if this is a secondary user
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 2c4c473..7e83f66 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
 import android.app.Activity;
@@ -42,7 +43,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-public class ProxySelector extends Fragment implements DialogCreatable {
+public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
     private static final String TAG = "ProxySelector";
 
     EditText    mHostnameField;
@@ -270,4 +271,9 @@
                 }
             }
         };
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PROXY_SELECTOR;
+    }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 990f485..a3376d3 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -43,6 +43,7 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
 
 import java.util.ArrayList;
@@ -57,7 +58,7 @@
  *
  * This is the initial screen.
  */
-public class ResetNetwork extends Fragment {
+public class ResetNetwork extends InstrumentedFragment {
     private static final String TAG = "ResetNetwork";
 
     // Arbitrary to avoid conficts
@@ -195,4 +196,9 @@
         establishInitialState();
         return mContentView;
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RESET_NETWORK;
+    }
 }
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index a67d2e6..7c2b613 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -39,6 +39,7 @@
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
@@ -58,7 +59,7 @@
  *
  * This is the confirmation screen.
  */
-public class ResetNetworkConfirm extends Fragment {
+public class ResetNetworkConfirm extends InstrumentedFragment {
 
     private View mContentView;
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -195,4 +196,9 @@
                     SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         }
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RESET_NETWORK_CONFIRM;
+    }
 }
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 64e1e3f..c78d6e2 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -37,7 +37,7 @@
  * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
  * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
  */
-public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
+public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragment {
 
     protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
 
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index 3f39088..adda01b 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -30,6 +30,7 @@
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -53,6 +54,11 @@
     private LockPatternUtils mLockPatternUtils;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SCREEN_PINNING;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 4ca2140..df217c8 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -49,6 +49,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -130,6 +131,11 @@
     private Intent mTrustAgentClickIntent;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SECURITY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index eecf7a2..4794608 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -66,6 +66,7 @@
 import android.widget.Button;
 import android.widget.SearchView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.XmlUtils;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -787,6 +788,9 @@
     @Override
     public void onResume() {
         super.onResume();
+        if (mIsShowingDashboard) {
+            MetricsLogger.visible(this, MetricsLogger.MAIN_SETTINGS);
+        }
 
         final int newHomeActivityCount = getHomeActivitiesCount();
         if (newHomeActivityCount != mHomeActivitiesCount) {
@@ -815,7 +819,9 @@
     @Override
     public void onPause() {
         super.onPause();
-
+        if (mIsShowingDashboard) {
+            MetricsLogger.hidden(this, MetricsLogger.MAIN_SETTINGS);
+        }
         unregisterReceiver(mBatteryInfoReceiver);
         mDynamicIndexableContentMonitor.unregister();
     }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index e87f676..bf41c80 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -29,7 +29,6 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroupAdapter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -46,7 +45,8 @@
 /**
  * Base class for Settings fragments, with some helper functions and dialog management.
  */
-public class SettingsPreferenceFragment extends PreferenceFragment implements DialogCreatable {
+public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceFragment
+        implements DialogCreatable {
 
     private static final String TAG = "SettingsPreferenceFragment";
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index ca1e8ec..125411a 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -44,6 +44,7 @@
 import android.preference.SwitchPreference;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.wifi.WifiApDialog;
 import com.android.settings.wifi.WifiApEnabler;
 import com.android.settingslib.TetherUtil;
@@ -107,6 +108,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TETHER;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 54fef36..1427d5f 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -32,6 +32,7 @@
 import android.util.ArrayMap;
 import android.util.ArraySet;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
 public class TrustAgentSettings extends SettingsPreferenceFragment implements
@@ -61,6 +62,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TRUST_AGENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.trust_agent_settings);
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 753afc7..d3935db 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -51,6 +51,7 @@
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ParcelableString;
 
 import java.security.cert.CertificateEncodingException;
@@ -60,7 +61,7 @@
 import java.util.List;
 import java.util.HashMap;
 
-public class TrustedCredentialsSettings extends Fragment {
+public class TrustedCredentialsSettings extends InstrumentedFragment {
 
     private static final String TAG = "TrustedCredentialsSettings";
 
@@ -68,6 +69,11 @@
 
     private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TRUSTED_CREDENTIALS;
+    }
+
     private enum Tab {
         SYSTEM("system",
                R.string.trusted_credentials_system_tab,
diff --git a/src/com/android/settings/UsageAccessSettings.java b/src/com/android/settings/UsageAccessSettings.java
index 362d27f..704c3c5 100644
--- a/src/com/android/settings/UsageAccessSettings.java
+++ b/src/com/android/settings/UsageAccessSettings.java
@@ -43,6 +43,7 @@
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
+import com.android.internal.logging.MetricsLogger;
 
 import java.util.List;
 import java.util.Collections;
@@ -400,6 +401,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USAGE_ACCESS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 7b2dcbf..8c8da31 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -34,6 +35,11 @@
 public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable {
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WALLPAPER_TYPE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 8e2c7ed..0638c94 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -32,6 +32,7 @@
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.imsphone.ImsPhone;
 import com.android.settings.widget.SwitchBar;
 
@@ -136,6 +137,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_CALLING;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index d94b8a7..000aa30 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -48,6 +48,7 @@
 import android.util.Log;
 
 import com.android.ims.ImsManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.TelephonyIntents;
@@ -238,6 +239,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIRELESS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index f0464ab..c4b3a96 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -43,6 +43,7 @@
 import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
 import com.android.settings.DialogCreatable;
@@ -198,6 +199,11 @@
     private DevicePolicyManager mDpm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.accessibility_settings);
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 9822fc3..ff9c9eb 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -35,6 +35,7 @@
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.SubtitleView;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -95,6 +96,11 @@
     private boolean mShowingCustom;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_CAPTION_PROPERTIES;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 5fd2e18..6092532 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -40,6 +40,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ConfirmDeviceCredentialActivity;
 import com.android.settings.R;
@@ -74,6 +75,11 @@
     private int mShownDialogId;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_SERVICE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mLockPatternUtils = new LockPatternUtils(getActivity());
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 1f7ecf7..c7ed1a1 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -24,6 +24,7 @@
 import android.view.accessibility.AccessibilityManager;
 
 import android.widget.Switch;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.widget.SwitchBar;
 
@@ -36,6 +37,11 @@
     private ListPreference mType;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_DALTONIZER;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
index 7fb1625..740f8c6 100644
--- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -18,6 +18,7 @@
 
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 
@@ -42,4 +43,9 @@
             }
         });
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 4650c06..44355c6 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -18,6 +18,7 @@
 
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 
@@ -42,4 +43,9 @@
             }
         });
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index bb60871..a34be22 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -41,7 +41,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-class AccountPreferenceBase extends SettingsPreferenceFragment
+abstract class AccountPreferenceBase extends SettingsPreferenceFragment
         implements AuthenticatorHelper.OnAccountsUpdateListener {
 
     protected static final String TAG = "AccountSettings";
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 017eb86..1bf83f3 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -46,6 +46,7 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -115,6 +116,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNT;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 382fa33..2de8e4a 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accounts;
 
+import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 
 import android.accounts.Account;
@@ -141,6 +142,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 5e7e81e..c4dace8 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -34,7 +34,9 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.CharSequences;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -54,7 +56,7 @@
  * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
  * which the action needs to be performed is different to the one the Settings App will run in.
  */
-public class ChooseAccountActivity extends PreferenceActivity {
+public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
 
     private static final String TAG = "ChooseAccountActivity";
     private String[] mAuthorities;
@@ -89,6 +91,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
+    }
+
+    @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 85ecd90..bbb8c14 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -47,6 +47,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AccountPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -87,6 +88,11 @@
     private Account mFirstAccount;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_MANAGE_ACCOUNTS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index 9c94525..28ac1d0 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -41,6 +41,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.ApplicationsState.AppEntry;
@@ -127,6 +128,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_ADVANCED;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mActivityResumed = true;
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index ac06176..a7dc500 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -35,12 +35,13 @@
 import android.preference.PreferenceFragment;
 import android.util.Log;
 
+import com.android.settings.InstrumentedPreferenceFragment;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.ApplicationsState.AppEntry;
 
 import java.util.ArrayList;
 
-public abstract class AppInfoBase extends PreferenceFragment
+public abstract class AppInfoBase extends InstrumentedPreferenceFragment
         implements ApplicationsState.Callbacks {
 
     public static final String ARG_PACKAGE_NAME = "package";
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index c31d8ad..ffb84ef 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -37,6 +37,7 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
@@ -187,4 +188,8 @@
                 : R.string.launch_defaults_none);
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_LAUNCH;
+    }
 }
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index d9dec19..88591d7 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -38,13 +38,15 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 
 import java.util.List;
 
-public class AppOpsDetails extends Fragment {
+public class AppOpsDetails extends InstrumentedFragment {
     static final String TAG = "AppOpsDetails";
 
     public static final String ARG_PACKAGE_NAME = "package";
@@ -192,6 +194,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APP_OPS_DETAILS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         if (!refreshUi()) {
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 382caed..782b8fb 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -28,9 +28,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
-public class AppOpsSummary extends Fragment {
+public class AppOpsSummary extends InstrumentedFragment {
     // layout inflater object used to inflate views
     private LayoutInflater mInflater;
     
@@ -49,6 +51,11 @@
 
     int mCurPos;
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APP_OPS_SUMMARY;
+    }
+
     class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
 
         public MyPagerAdapter(FragmentManager fm) {
diff --git a/src/com/android/settings/applications/AppPermissionSettings.java b/src/com/android/settings/applications/AppPermissionSettings.java
index 496faf5..1776b3a 100644
--- a/src/com/android/settings/applications/AppPermissionSettings.java
+++ b/src/com/android/settings/applications/AppPermissionSettings.java
@@ -35,6 +35,7 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.ISms;
 import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.settings.R;
@@ -183,6 +184,11 @@
                 count, count);
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_PERMISSION;
+    }
+
     private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
         private final String mPackageName;
         private final ISms mSmsManager;
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 2f65a76..4b80fdd 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -37,6 +37,7 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
@@ -487,6 +488,11 @@
         return Formatter.formatFileSize(context, size);
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_APP_STORAGE;
+    }
+
     class ClearCacheObserver extends IPackageDataObserver.Stub {
         public void onRemoveCompleted(final String packageName, final boolean succeeded) {
             final Message msg = mHandler.obtainMessage(MSG_CLEAR_CACHE);
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 0fffb7e..9f6c969 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -56,6 +56,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DataUsageSummary;
 import com.android.settings.DataUsageSummary.AppItem;
 import com.android.settings.R;
@@ -223,6 +224,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_INSTALLED_APP_DETAILS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         AppItem app = new AppItem(mAppEntry.info.uid);
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a034964..84b9763 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -52,6 +52,8 @@
 import android.widget.Spinner;
 
 import com.android.internal.content.PackageHelper;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Settings.AllApplicationsActivity;
 import com.android.settings.Settings.NotificationAppListActivity;
@@ -113,8 +115,8 @@
  * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE
  * intent.
  */
-public class ManageApplications extends Fragment implements OnItemClickListener,
-        OnItemSelectedListener {
+public class ManageApplications extends InstrumentedFragment
+        implements OnItemClickListener, OnItemSelectedListener {
 
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -320,6 +322,20 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return MetricsLogger.MANAGE_APPLICATIONS;
+            case LIST_TYPE_ALL:
+                return MetricsLogger.MANAGE_APPLICATIONS_ALL;
+            case LIST_TYPE_NOTIFICATION:
+                return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
+            default:
+                return MetricsLogger.VIEW_UNKNOWN;
+        }
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         updateView();
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index f0e76d4..1e7cf09 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -17,7 +17,6 @@
 package com.android.settings.applications;
 
 import android.app.ActivityManager;
-import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -32,6 +31,8 @@
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -42,7 +43,7 @@
 
 import static com.android.settings.Utils.prepareCustomPreferencesList;
 
-public class ProcessStatsDetail extends Fragment implements Button.OnClickListener {
+public class ProcessStatsDetail extends InstrumentedFragment implements Button.OnClickListener {
     private static final String TAG = "ProcessStatsDetail";
 
     public static final int ACTION_FORCE_STOP = 1;
@@ -98,6 +99,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_DETAIL;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         checkForceStop();
diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java
index ab7dbdb..7ae2824 100644
--- a/src/com/android/settings/applications/ProcessStatsMemDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.applications;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -25,11 +24,13 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.internal.app.ProcessStats;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
 import static com.android.settings.Utils.prepareCustomPreferencesList;
 
-public class ProcessStatsMemDetail extends Fragment {
+public class ProcessStatsMemDetail extends InstrumentedFragment {
     public static final String EXTRA_MEM_TIMES = "mem_times";
     public static final String EXTRA_MEM_STATE_WEIGHTS = "mem_state_weights";
     public static final String EXTRA_MEM_CACHED_WEIGHT = "mem_cached_weight";
@@ -84,6 +85,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
     }
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index bf1f666..45e24dd 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -41,7 +41,9 @@
 import com.android.internal.app.IProcessStats;
 import com.android.internal.app.ProcessMap;
 import com.android.internal.app.ProcessStats;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.MemInfoReader;
+import com.android.settings.InstrumentedPreferenceFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -53,7 +55,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 
-public class ProcessStatsUi extends PreferenceFragment
+public class ProcessStatsUi extends InstrumentedPreferenceFragment
         implements LinearColorBar.OnRegionTappedListener {
     static final String TAG = "ProcessStatsUi";
     static final boolean DEBUG = false;
@@ -184,14 +186,14 @@
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        refreshStats();
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_PROCESS_STATS_UI;
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onResume() {
+        super.onResume();
+        refreshStats();
     }
 
     @Override
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 45cad3d..8f074fd 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -33,6 +33,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -43,7 +45,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class RunningServiceDetails extends Fragment
+public class RunningServiceDetails extends InstrumentedFragment
         implements RunningState.OnRefreshUiListener {
     static final String TAG = "RunningServicesDetails";
 
@@ -533,6 +535,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.RUNNING_SERVICE_DETAILS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         ensureData();
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index c85e515..b1eed51 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -44,6 +44,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -123,6 +124,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mInitialScanStarted = (savedInstanceState != null);    // don't auto start scan after rotation
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 809ca96..9441626 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -29,6 +29,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
@@ -84,6 +85,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH_DEVICE_PICKER;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivity().setTitle(getString(R.string.device_picker));
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index e563e64..1df6275 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -30,6 +30,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.EditText;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -69,6 +70,11 @@
     private boolean mProfileGroupIsRemoved;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.BLUETOOTH_DEVICE_PROFILES;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 8a92860..ae1b6d0 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -34,12 +34,15 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 
 import java.util.List;
 
-public class DashboardSummary extends Fragment {
+public class DashboardSummary extends InstrumentedFragment {
     private static final String LOG_TAG = "DashboardSummary";
 
     private LayoutInflater mLayoutInflater;
@@ -67,6 +70,11 @@
     private HomePackageReceiver mHomePackageReceiver = new HomePackageReceiver();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DASHBOARD_SUMMARY;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 0a43ce9..af7cf4a 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.dashboard;
 
-import android.app.Fragment;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -37,6 +36,8 @@
 import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.TextView;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -44,7 +45,7 @@
 
 import java.util.HashMap;
 
-public class SearchResultsSummary extends Fragment {
+public class SearchResultsSummary extends InstrumentedFragment {
 
     private static final String LOG_TAG = "SearchResultsSummary";
 
@@ -245,6 +246,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DASHBOARD_SEARCH_RESULTS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 37b6c1d..c4f4bbb 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.deviceinfo;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
@@ -27,9 +28,10 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 
-public class ImeiInformation extends PreferenceActivity {
+public class ImeiInformation extends InstrumentedPreferenceActivity {
 
     private static final String KEY_PRL_VERSION = "prl_version";
     private static final String KEY_MIN_NUMBER = "min_number";
@@ -151,4 +153,8 @@
         }
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_IMEI_INFORMATION;
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 1958f38..a07f7c2 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -47,6 +47,7 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -85,6 +86,11 @@
     private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_MEMORY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index e50d0d9..c52f385 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -36,9 +36,11 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -65,7 +67,7 @@
  * # Signal Strength
  *
  */
-public class SimStatus extends PreferenceActivity {
+public class SimStatus extends InstrumentedPreferenceActivity {
     private static final String TAG = "SimStatus";
 
     private static final String KEY_DATA_STATE = "data_state";
@@ -170,6 +172,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_SIM_STATUS;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         if (mPhone != null) {
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 646792c..a78d06c 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -41,7 +41,9 @@
 import android.widget.ListAdapter;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -55,7 +57,7 @@
  * # XMPP/buzz/tickle status : TODO
  *
  */
-public class Status extends PreferenceActivity {
+public class Status extends InstrumentedPreferenceActivity {
 
     private static final String KEY_BATTERY_STATUS = "battery_status";
     private static final String KEY_BATTERY_LEVEL = "battery_level";
@@ -232,6 +234,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_STATUS;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index c3b3f96..d8a675c 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -28,6 +28,7 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -82,6 +83,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_USB;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mUsbManager = (UsbManager)getSystemService(Context.USB_SERVICE);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 63e4e13..c977063 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.fuelgauge;
 
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -24,10 +23,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 
-public class BatteryHistoryDetail extends Fragment {
+public class BatteryHistoryDetail extends InstrumentedFragment {
     public static final String EXTRA_STATS = "stats";
     public static final String EXTRA_BROADCAST = "broadcast";
 
@@ -50,4 +51,9 @@
         chart.setStats(mStats, mBatteryBroadcast);
         return view;
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_BATTERY_HISTORY_DETAIL;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index e6b90a7..d8a9ca0 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -34,6 +34,7 @@
 import android.util.Log;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -61,6 +62,11 @@
     private PowerManager mPowerManager;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_BATTERY_SAVER;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (mCreated) {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index e3c8dab..d796570 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -47,10 +47,12 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.util.FastPrintWriter;
 import com.android.settings.DisplaySettings;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -64,7 +66,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
+public class PowerUsageDetail extends InstrumentedFragment implements Button.OnClickListener {
 
     // Note: Must match the sequence of the DrainType
     private static int[] sDrainTypeDesciptions = new int[] {
@@ -345,6 +347,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_POWER_USAGE_DETAIL;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mStartTime = android.os.Process.getElapsedCpuTime();
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 5ee4fa0..dbc78c2 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -38,10 +38,12 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.HelpUtils;
+import com.android.settings.InstrumentedPreferenceFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 
@@ -51,7 +53,7 @@
  * 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 {
+public class PowerUsageSummary extends InstrumentedPreferenceFragment {
 
     private static final boolean DEBUG = false;
 
@@ -120,6 +122,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_POWER_USAGE_SUMMARY;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         BatteryStatsHelper.dropFile(getActivity(), BATTERY_HISTORY_FILE);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 20a273f..1b2f567 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -51,6 +51,7 @@
 import android.view.textservice.TextServicesManager;
 
 import com.android.internal.app.LocalePicker;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.SettingsActivity;
@@ -104,6 +105,11 @@
     private DevicePolicyManager mDpm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_LANGUAGE;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 146f512..c73ccef 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -31,6 +31,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -53,6 +54,11 @@
     private Collator mCollator;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_SUBTYPE_ENABLER;
+    }
+
+    @Override
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 3562cb4..69586b9 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.SettingsPreferenceFragment;
 
 import android.content.Context;
@@ -49,6 +50,11 @@
     public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_KEYBOARD;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 5a8ccea..729fdc6 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -30,6 +30,7 @@
 import android.view.textservice.TextServicesManager;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -54,6 +55,11 @@
     private TextServicesManager mTsm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_SPELL_CHECKERS;
+    }
+
+    @Override
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 4f231cb..3eb5dc6 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.inputmethod;
 
-import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,6 +26,8 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -40,7 +41,7 @@
  * As opposed to the UserDictionaryActivity, this is only invoked within Settings
  * from the UserDictionarySettings.
  */
-public class UserDictionaryAddWordFragment extends Fragment
+public class UserDictionaryAddWordFragment extends InstrumentedFragment
         implements AdapterView.OnItemSelectedListener,
         com.android.internal.app.LocalePicker.LocaleSelectionListener {
 
@@ -109,6 +110,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_USER_DICTIONARY_ADD_WORD;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         // We are being shown: display the word
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 7439001..ab23614 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -43,6 +44,11 @@
     private String mLocale;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.INPUTMETHOD_USER_DICTIONARY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index 7e95cac..d203bc4 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -19,6 +19,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 
 /**
@@ -42,6 +43,11 @@
     private RadioButtonPreference mSensorsOnly;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION_MODE;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         createPreferenceHierarchy();
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index d66f91c..d0dde32 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -34,6 +34,7 @@
 import android.view.MenuItem;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -84,6 +85,11 @@
     private UserManager mUm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java
index 364ad7b..428701a 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/ScanningSettings.java
@@ -21,6 +21,7 @@
 import android.preference.SwitchPreference;
 import android.provider.Settings.Global;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -31,6 +32,11 @@
     private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning";
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.LOCATION_SCANNING;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         createPreferenceHierarchy();
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index d567c7e..ec1dd38 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -34,6 +34,7 @@
 import android.preference.SwitchPreference;
 import android.telephony.TelephonyManager;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -60,6 +61,11 @@
     private Preference mWifiDisabled;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NET_DATA_USAGE_METERED;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Context context = getActivity();
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 20201f4..6267570 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -27,11 +27,13 @@
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;
 
-public class AndroidBeam extends Fragment
+public class AndroidBeam extends InstrumentedFragment
         implements SwitchBar.OnSwitchChangeListener {
     private View mView;
     private NfcAdapter mNfcAdapter;
@@ -98,4 +100,9 @@
         }
         mSwitchBar.setEnabled(true);
     }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NFC_BEAM;
+    }
 }
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 02254dd..4f04d73 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -42,6 +42,7 @@
 import android.widget.TextView;
 
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -58,6 +59,11 @@
 
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NFC_PAYMENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 375b855..db957a7 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -35,6 +35,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.AppHeader;
 import com.android.settings.R;
@@ -87,6 +88,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_APP_NOTIFICATION;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 123f0ef..ce7ba14 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -48,6 +48,7 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.DropDownPreference;
 import com.android.settings.R;
@@ -105,6 +106,11 @@
     private int mRingerMode = -1;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 3f4d3df..a54e3dd 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -46,6 +46,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -137,6 +138,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_STATION;
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         logd("onActivityCreated(%s)", savedInstanceState);
         super.onActivityCreated(savedInstanceState);
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index 8528ec7..b765b35 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -33,6 +33,7 @@
 import android.provider.Settings.System;
 import android.telephony.TelephonyManager;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -166,6 +167,11 @@
     private Context mContext;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_OTHER_SOUND;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index 2bfad1a..a6df6ec 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -59,6 +60,11 @@
         private RadioButton mHideAllButton;
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.NOTIFICATION_REDACTION;
+        }
+
+        @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
             View view = inflater.inflate(R.layout.redaction_interstitial, container, false);
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 441990b..c2e143a 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -50,6 +50,7 @@
 import android.widget.ScrollView;
 import android.widget.TimePicker;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -144,6 +145,11 @@
     private AlertDialog mDialog;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 978e4d6..b16c63d 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -32,6 +32,7 @@
 import android.view.MenuItem;
 import android.view.View;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -68,6 +69,11 @@
     private PrintJob mPrintJob;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_JOB_SETTINGS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index e36e92c..e42fddd 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -59,6 +59,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -140,6 +141,11 @@
     private SearchView mSearchView;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_SERVICE_SETTINGS;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         mSettingsContentObserver.register(getContentResolver());
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 7317d79..27ccc59 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -57,6 +57,7 @@
 import android.widget.TextView;
 
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DialogCreatable;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -123,6 +124,11 @@
     private Spinner mSpinner;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_SETTINGS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.print_settings);
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index e418e9b..c96ce09 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,10 +23,11 @@
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.HomeSettings;
-import com.android.settings.ScreenPinningSettings;
 import com.android.settings.PrivacySettings;
+import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.WallpaperTypeSettings;
+import com.android.settings.WifiCallingSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.applications.AdvancedAppSettings;
@@ -37,6 +38,7 @@
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
@@ -48,7 +50,6 @@
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.WifiCallingSettings;
 
 import java.util.HashMap;
 
@@ -139,6 +140,7 @@
 
         // Location
         sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
+        sRankMap.put(ScanningSettings.class.getName(), RANK_LOCATION);
 
         // Security
         sRankMap.put(SecuritySettings.class.getName(), RANK_SECURITY);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index d5aa4b7..102e0bf 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -39,6 +39,7 @@
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
 import com.android.settings.location.LocationSettings;
+import com.android.settings.location.ScanningSettings;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.notification.NotificationSettings;
 import com.android.settings.notification.OtherSoundSettings;
@@ -210,6 +211,13 @@
                         LocationSettings.class.getName(),
                         R.drawable.ic_settings_location));
 
+        sResMap.put(ScanningSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(ScanningSettings.class.getName()),
+                        R.xml.location_scanning,
+                        ScanningSettings.class.getName(),
+                        R.drawable.ic_settings_location));
+
         sResMap.put(SecuritySettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(SecuritySettings.class.getName()),
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 3ebc250..91dadbb 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -46,6 +46,7 @@
 import android.widget.TextView;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -116,6 +117,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SIM;
+    }
+
+    @Override
     public void onCreate(final Bundle bundle) {
         super.onCreate(bundle);
 
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index fa61aec..c8a4c3d 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -19,6 +19,7 @@
 import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
 import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -143,6 +144,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TTS_TEXT_TO_SPEECH;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.tts_settings);
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 542de41..691e155 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -33,6 +33,7 @@
 import android.util.Log;
 import android.util.Pair;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -99,6 +100,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TTS_ENGINE_SETTINGS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.tts_engine_settings);
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 74ee6d9..e09d650 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -56,6 +56,7 @@
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.Switch;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -258,6 +259,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USERS_APP_RESTRICTIONS;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index d738dd6..90e5a43 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -26,6 +26,7 @@
 import android.preference.Preference;
 import android.preference.SwitchPreference;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -65,6 +66,11 @@
     private Bundle mDefaultGuestRestrictions;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USER_DETAILS;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index ff06b69..6d0cc5a 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -56,6 +56,7 @@
 import android.view.View.OnClickListener;
 import android.widget.SimpleAdapter;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.OwnerInfoSettings;
@@ -179,6 +180,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USER;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/voice/VoiceInputSettings.java b/src/com/android/settings/voice/VoiceInputSettings.java
index bc299c2..bac297e 100644
--- a/src/com/android/settings/voice/VoiceInputSettings.java
+++ b/src/com/android/settings/voice/VoiceInputSettings.java
@@ -27,6 +27,7 @@
 import android.service.voice.VoiceInteractionService;
 import android.service.voice.VoiceInteractionServiceInfo;
 import android.speech.RecognitionService;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -73,6 +74,11 @@
     private VoiceInputHelper mHelper;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.VOICE_INPUT;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.voice_input_settings);
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index c6c3546..04853f1 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -50,6 +50,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
@@ -91,6 +92,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.VPN;
+    }
+
+    @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 9f3ac82..7c5883a 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -59,6 +59,7 @@
 import android.widget.TextView;
 
 import com.android.internal.app.MediaRouteDialogPresenter;
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -115,6 +116,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WFD_WIFI_DISPLAY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 17fee88..4f5884e 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -42,6 +42,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.AppListSwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -81,6 +82,11 @@
     };
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_ADVANCED;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.wifi_advanced_settings);
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index e92bda7..2627bc4 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -26,6 +26,7 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -54,6 +55,11 @@
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_SAVED_ACCESS_POINTS;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.wifi_display_saved_access_points);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 5c66309..0d04622 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -47,6 +47,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsActivity;
@@ -322,6 +323,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 879ebf8..72dca9e 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -51,6 +51,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -477,6 +478,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_P2P;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         if (mSelectedWifiPeer != null) {
             outState.putParcelable(SAVE_DIALOG_PEER, mSelectedWifiPeer.device);