diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6ea1c66..8284e99 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -365,8 +365,8 @@
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ ፒን  ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
     <string name="crypt_keeper_confirm_encrypt" msgid="736289627726831055">"መሳሪያዎን መመስጠርን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትዎን መሳል አለብዎ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ጡባዊ ተኮው ብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጡት፤ ውሂብ ያጣሉ።ምስጠራ 1 ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"እባክህ ጡባዊህ እስኪመሳጠር ድረስ ጠብቅ።<xliff:g id="PERCENT">^1</xliff:g> ተጠናቋል።"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"እባክህ  ስልክህ እስኪመሳጠር ድረስ ጠብቅ። <xliff:g id="PERCENT">^1</xliff:g>% ተጠናቋል።"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6110a64..8aaf664 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -815,7 +815,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Brillantor"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor automàtica"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor segons la llum disponible."</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor segons la llum disponible"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -1905,7 +1905,7 @@
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
     <string name="managed_profile_not_available_label" msgid="3489771164851107822">"El perfil professional encara no està disponible."</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"Suprimeix el perfil de feina"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"Suprimeix el perfil professional"</string>
     <string name="background_data" msgid="5779592891375473817">"Dades en segon pla"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Desactiva dades segon pla?"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5d1cc01..6227b6e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -356,7 +356,7 @@
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrování telefonu"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="2876073029767953111">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud tablet zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný kód PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Dešifrování lze provést pouze obnovením továrních dat, kterým vymažete všechna svá data.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je třeba zahájit s plně nabitou baterií a tablet je třeba mít během procesu zapojený do zásuvky.Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud telefon zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný kód PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Dešifrování lze provést pouze obnovením továrních dat, kterým vymažete všechna svá data.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je potřeba zahájit s nabitou baterií a během šifrování je potřeba ponechat telefon připojený ke zdroji napájení. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="5573427498609458721">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud telefon zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný kód PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Jediným dalším způsobem dešifrování je  obnovení továrních nastavení, kterým vymažete všechna svá data.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je potřeba zahájit s nabitou baterií a během šifrování je potřeba ponechat telefon připojený ke zdroji napájení. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4bd73b9..9987d23 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -1596,7 +1596,7 @@
     <string name="power_charging_duration_ac" msgid="3611179931297824699">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> korrontearen bidez guztiz kargatu arte"</string>
     <string name="power_charging_duration_usb" msgid="1106605348913397583">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> USB bidez guztiz kargatu arte"</string>
     <string name="power_charging_duration_wireless" msgid="633606920144617227">"%% <xliff:g id="LEVEL">%1$d</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> haririk gabe guztiz kargatu arte"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"Azkenezkoz guztiz kargatu zenetik emandako erabilera"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"Azkenekoz guztiz kargatu zenetik emandako erabilera"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Azken aldiz berrezarri ondoren erabilitako bateria"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> baterian"</string>
@@ -2241,7 +2241,7 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Kendu murrizketak"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Aldatu PIN kodea"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Erakutsi jakinarazpenak"</string>
-    <string name="help_label" msgid="6886837949306318591">"Laguntza eta iritzia"</string>
+    <string name="help_label" msgid="6886837949306318591">"Laguntza eta iritziak"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Edukia gordetzeko kontua"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Argazkiaren IDa"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Mehatxu oso larriak"</string>
@@ -2447,7 +2447,7 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Lanegunetako gauak"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hasiera-ordua"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Amaiera-ordua"</string>
-    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hurrengo egunean"</string>
+    <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (hurrengo egunean)"</string>
     <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7dae014..c720c8d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1591,7 +1591,7 @@
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
     <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
-    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>٪٪ - ‏<xliff:g id="STATE">%2$s</xliff:g>"</string>
+    <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>٪ - ‏<xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string>
     <string name="power_charging_duration_ac" msgid="3611179931297824699">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق AC"</string>
     <string name="power_charging_duration_usb" msgid="1106605348913397583">"‏<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق USB"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1042b56..13b1d8f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -514,7 +514,7 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Options…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Paramètres avancés"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Si Bluetooth activé, appareil peut communiquer avec autres appareils Bluetooth à proximité."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"L\'activation du Bluetooth permet à votre appareil de communiquer avec les appareils Bluetooth à proximité."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Paramètres audio du support"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Paramètres audio du téléphone"</string>
@@ -1076,7 +1076,7 @@
     <string name="network_settings_title" msgid="4871233236744292831">"Réseaux mobiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Forfait mobile"</string>
     <string name="sms_application_title" msgid="6134351177937015839">"Application SMS par défaut"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application SMS ?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Changer d\'application pour les SMS ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application SMS ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application SMS ?"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Changer d\'assistant Wi‑Fi ?"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index e02b933..1459c18 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -281,7 +281,7 @@
     <string name="okay" msgid="1997666393121016642">"Aceptar"</string>
     <string name="yes_all_caps" msgid="5454685069075197457">"SI"</string>
     <string name="no_all_caps" msgid="3242375449351298529">"NON"</string>
-    <string name="forget" msgid="7267115980248732932">"ESQUECER"</string>
+    <string name="forget" msgid="7267115980248732932">"BORRAR"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atallo de configuración"</string>
@@ -563,7 +563,7 @@
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Asistente de wifi"</string>
     <string name="wifi_assistant_title_message" msgid="6240721017579074015">"<xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> conéctate automaticamente á mellor wifi dispoñible"</string>
     <string name="wifi_assistant_open_app" msgid="4803044899535675063">"ABRIR APLICACIÓN"</string>
-    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Emitir en pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="2925465988657380522">"Enviar pantalla"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activar visualización sen fíos"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Non hai dispositivos cerca."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
@@ -572,7 +572,7 @@
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"Non dispoñible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configuración da pantalla"</string>
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcións de visualización sen fíos"</string>
-    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Feito"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
@@ -689,7 +689,7 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Erro ao conectar á rede"</string>
-    <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Erro ao esquecer a rede"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Gardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Erro ao gardar a rede"</string>
@@ -1076,9 +1076,9 @@
     <string name="network_settings_title" msgid="4871233236744292831">"Redes móbiles"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móbil"</string>
     <string name="sms_application_title" msgid="6134351177937015839">"Aplicación de SMS predeterminada"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiar aplicación de SMS?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a túa aplicación de SMS?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a túa aplicación de SMS?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Queres cambiar a aplicación de SMS?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Queres utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a túa aplicación de SMS?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Queres utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a túa aplicación de SMS?"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Queres cambiar o asistente da wifi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Queres utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> para xestionar as túas conexións de rede?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Queres utilizar <xliff:g id="NEW_APP">%s</xliff:g> para xestionar as túas conexións de rede?"</string>
@@ -1880,7 +1880,7 @@
     <string name="wifi_setup_back" msgid="144777383739164044">"Atrás"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalles da rede"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Conectar"</string>
-    <string name="wifi_setup_forget" msgid="2562847595567347526">"Esquecer"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Gardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 672d379..424b3a7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -996,7 +996,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"APN हटाएं"</string>
     <string name="menu_new" msgid="3014205883303921729">"नया APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"जोड़ें"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"छोड़ें"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"अभी नहीं"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="8418502878620394756">"नाम फ़ील्‍ड खाली मत छोड़िए."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"APN खाली नहीं हो सकता."</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 58ff0e3..47fb233 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -343,7 +343,7 @@
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Sýna notandaupplýsingar á lásskjá"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Notandaupplýsingar"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Sýna notandaupplýsingar á lásskjá"</string>
-    <string name="profile_info_settings_title" msgid="3518603215935346604">"Notandaupplýsingar"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Upplýsingar um snið"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
@@ -1846,7 +1846,7 @@
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Villa við að velja aðgangsorð fyrir afritun"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Hætta að taka öryggisafrit af Wi-Fi aðgangsorðum, bókamerkjum, öðrum stillingum og gögnum forrita, og eyða öllum afritum af þjónum Google?"</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Stillingar stjórnanda tækis"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Stillingar tækisumsjónar"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Stjórnandi tækis"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Gera óvirkt"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Stjórnendur tækis"</string>
@@ -1858,7 +1858,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Virkja stjórnanda tækis?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Virkja"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Stjórnandi tækis"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Ef þessi stjórnandi er gerður virkur verður forritinu <xliff:g id="APP_NAME">%1$s</xliff:g> leyft að framkvæma eftirfarandi aðgerðir:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Ef forritið <xliff:g id="APP_NAME">%1$s</xliff:g> er gert að stjórnanda tækisins fær það leyfi til að framkvæma eftirfarandi aðgerðir:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Þessi stjórnandi er virkur og leyfir forritinu <xliff:g id="APP_NAME">%1$s</xliff:g> að framkvæma eftirfarandi aðgerðir:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Virkja prófílstjórnanda?"</string>
     <string name="adding_profile_owner_warning" msgid="6469780138110334180">"Ef haldið er áfram fær stjórnandinn umsjón með notandareikningnum þínum og getur einnig vistað tengd gögn auk persónulegu upplýsinganna þinna.\n\nStjórnandinn getur fylgst með og stjórnað stillingum, aðgangi, forritum og gögnum sem tengjast þessum notanda, þ.m.t. netnotkun og staðsetningarupplýsingum tækisins."</string>
@@ -2162,14 +2162,14 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Kanna traust skilríki"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Notendur"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Notendur og prófílar"</string>
-    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Bæta notanda eða prófíl við"</string>
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Bæta notanda eða sniði við"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Bæta notanda við"</string>
-    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Takmarkaður prófíll"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Takmarkað snið"</string>
     <string name="user_summary_managed_profile" msgid="7369539529693048111">"Vinnusnið"</string>
-    <string name="user_need_lock_message" msgid="2596365678651842785">"Áður en þú getur búið til takmarkaðan prófíl þarftu að setja upp skjálás til að vernda forritin þín og persónuleg gögn."</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Áður en þú getur búið til takmarkað snið þarftu að setja upp skjálás til að vernda forritin þín og persónuleg gögn."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Velja lás"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ekki uppsett"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ekki uppsett – takmarkaður prófíll"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ekki uppsett – takmarkað snið"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"Ekki uppsett – vinnusnið"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigandi"</string>
     <string name="user_you" msgid="1639158809315025986">"Þú (<xliff:g id="NAME">%s</xliff:g>)"</string>
@@ -2178,13 +2178,13 @@
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Notendur hafa sín eigin forrit og efni"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Hægt er að takmarka aðgang að forritum og efni á reikningnum þínum"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Notandi"</string>
-    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Takmarkaður prófíll"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Takmarkað snið"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Bæta nýjum notanda við?"</string>
     <string name="user_add_user_message_long" msgid="718192651887726259">"Þú getur búið til fleiri notendur til að deila þessu tæki með öðrum. Hver notandi hefur sitt eigið svæði sem viðkomandi getur sérsniðið með eigin forritum, veggfóðri o.s.frv. Notendur geta einnig breytt þeim stillingum tækisins sem hafa áhrif á alla notendur, t.d. Wi-Fi.\n\nÞegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Þegar þú bætir nýjum notanda við þarf sá notandi að setja upp svæðið sitt.\n\nHvaða notandi sem er getur uppfært forrit fyrir alla aðra notendur."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setja notanda upp núna?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Gakktu úr skugga um að notandinn geti tekið tækið og sett upp sitt svæði"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Setja upp prófíl núna?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Setja upp snið núna?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Setja upp núna"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ekki núna"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Aðeins eigandi spjaldtölvunnar getur haft umsjón með notendum."</string>
@@ -2193,10 +2193,10 @@
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eyða <xliff:g id="USER_NAME">%1$s</xliff:g> úr þessu tæki"</string>
     <string name="user_add_on_lockscreen_menu" msgid="3025132738715222247">"Bæta notendum við þegar tækið er læst"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nýr notandi"</string>
-    <string name="user_new_profile_name" msgid="2632088404952119900">"Nýr prófíll"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nýtt snið"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eyða sjálfum/sjálfri þér?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"Fjarlægja þennan notanda?"</string>
-    <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Fjarlægja þennan prófíl?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Fjarlægja þetta snið?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Fjarlægja vinnusnið?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Þú munt glata svæðinu þínu og gögnum sem eru í þessari spjaldtölvu. Ekki er hægt að afturkalla þessa aðgerð."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Þú munt glata svæðinu þínu og gögnum sem eru í þessum síma. Ekki er hægt að afturkalla þessa aðgerð."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 68cbb6f..017cfb1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -461,9 +461,9 @@
     <string name="device_admin_title" msgid="3562216873644263804">"ניהול מכשירים"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"מנהלי התקנים"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"הצג או השבת מנהלי התקנים"</string>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"סוכני אמון"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"סביבות אמינות"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"כדי להשתמש בתכונה זו, תחילה הגדר נעילת מסך"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"הצג או השבת סוכני אמון"</string>
+    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"הצג או השבת סביבות אמינות"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"‏הפעל את Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -1854,7 +1854,7 @@
     <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"‏כדי למנוע את הגישה של <xliff:g id="APP_NAME">%1$s</xliff:g> אל פרופיל העבודה שלך, הסר את הפרופיל תחת \'הגדרות\' &gt; \'חשבונות\'"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"אישי"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"עבודה"</string>
-    <string name="no_trust_agents" msgid="7450273545568977523">"אין סוכני אמון זמינים"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"אין סביבות אמינות זמינות"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"להפעיל את מנהל המכשיר?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"הפעל"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"מנהל מכשיר"</string>
@@ -2157,8 +2157,8 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"ייתכן שהרשת מנוטרת"</string>
     <string name="done_button" msgid="1991471253042622230">"בוצע"</string>
     <string name="ssl_ca_cert_dialog_title" msgid="5339377665264149395">"ניטור רשתות"</string>
-    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"המכשיר הזה מנוהל על ידי:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nמנהל המערכת יכול לנטר את הפעילות שלך ברשת, כולל דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nלמידע נוסף, פנה אל מנהל המערכת."</string>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"צד שלישי מסוגל לעקוב אחר הפעילות שלך ברשת, כולל הודעות דוא\"ל, אפליקציות ואתרים מאובטחים.\n\nאישור מהימן המותקן במכשיר מאפשר זאת."</string>
+    <string name="ssl_ca_cert_info_message" msgid="4583879256548819713">"המכשיר הזה מנוהל על ידי:\n<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>\n\nמנהל המערכת יכול לנטר את הפעילות שלך ברשת, כולל אימייל, אפליקציות ואתרים מאובטחים.\n\nלמידע נוסף, פנה אל מנהל המערכת."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"צד שלישי מסוגל לעקוב אחר הפעילות שלך ברשת, כולל הודעות אימייל, אפליקציות ואתרים מאובטחים.\n\nאישור מהימן המותקן במכשיר מאפשר זאת."</string>
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"בדוק פרטי כניסה מהימנים"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9439297..7423bef 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -52,7 +52,7 @@
     <string name="radioInfo_service_off" msgid="1434084741785525415">"無線通信をOFF"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"ローミング"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"ローミングなし"</string>
-    <string name="radioInfo_phone_idle" msgid="7489244938838742820">"アイドル"</string>
+    <string name="radioInfo_phone_idle" msgid="7489244938838742820">"非アクティブ"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"着信中"</string>
     <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"通話中"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"切断"</string>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index 9c102fc..9ef88e4 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -505,8 +505,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"ಆಫ್ ಆಗಿದೆ"</item>
-    <item msgid="5656544177755411222">"ಸೀಮಿತವಾದ ಅಡೆತಡೆಗಳು"</item>
-    <item msgid="8735337502532332056">"ಶೂನ್ಯ ಅಡೆತಡೆಗಳು"</item>
+    <item msgid="5656544177755411222">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ಆಗಾಗ ತಡೆಹಾಕು"</item>
+    <item msgid="8735337502532332056">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳಿಗೆ ತಡೆಹಾಕದಿರು"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ಸಾಮಾನ್ಯ"</item>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 044337a..504014b 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -694,8 +694,8 @@
     <string name="wifi_save" msgid="3331121567988522826">"ಉಳಿಸು"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ನೆಟ್‌ವರ್ಕ್‌ ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ರದ್ದುಮಾಡು"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"ಹೇಗಿದ್ದರೂ ಸ್ಕಿಪ್‌ ಮಾಡಿ"</string>
-    <string name="wifi_dont_skip" msgid="7350341524881124808">"ಸ್ಕಿಪ್‌ ಮಾಡಬೇಡಿ"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"ಅದೇನೇ ಇರಲಿ ಸ್ಕಿಪ್‌ ಮಾಡು"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"ಸ್ಕಿಪ್‌ ಮಾಡಬೇಡ"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"ಎಚ್ಚರಿಕೆ: ನೀವು Wi-Fi ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ಆರಂಭಿಕ ಡೌನ್‌ಲೋಡ್‌ಗಳು ಮತ್ತು ನವೀಕರಣಗಳಿಗಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾವನ್ನು ಮಾತ್ರ ಬಳಸುತ್ತದೆ. ಸಂಭಾವ್ಯ ಡೇಟಾ ಶುಲ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು, Wi-Fi ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
@@ -1681,7 +1681,7 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"ಬ್ಯಾಟರಿ ರಕ್ಷಕ"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"ಬ್ಯಾಟರಿ ಸೇವರ್‌‌"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವಿಕೆ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"%1$d%% ಬ್ಯಾಟರಿ ಇದ್ದಾಗ"</string>
@@ -1855,10 +1855,10 @@
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ವೈಯಕ್ತಿಕ"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"ಕೆಲಸ"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"ಯಾವುದೇ ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"ಸಾಧನ ನಿರ್ವಾಹಕವನ್ನು ಕ್ರಿಯಾತ್ಮಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"ಸಾಧನ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"ಕ್ರಿಯಾತ್ಮಕಗೊಳಿಸು"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"ಸಾಧನ ನಿರ್ವಾಹಕ"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"ಈ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"ಈ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"ಈ ನಿರ್ವಾಹಕವು ಸಕ್ರಿಯವಾಗಿದೆ ಮತ್ತು ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"ಪ್ರೊಫೈಲ್ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="adding_profile_owner_warning" msgid="6469780138110334180">"ಮುಂದುವರಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಡೇಟಾಗೆ ಹೆಚ್ಚುವರಿಯಾಗಿ ಸಂಯೋಜಿತವಾದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲು ಸಾಧ್ಯವಾಗಬಹುದಾದದ್ದನ್ನು ಸಹ ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಂದ  ನಿಮ್ಮ ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಲಾಗುತ್ತದೆ.\n\nನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಪ್ರವೇಶ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಈ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡುವ ಮತ್ತು ನಿರ್ವಹಿಸುವ ಸಾಮರ್ಥ್ಯವನ್ನು ಹೊಂದಿದ್ದಾರೆ."</string>
@@ -1903,7 +1903,7 @@
     <string name="sync_active" msgid="8476943765960863040">"ಸಿಂಕ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"ಸಿಂಕ್ ಮಾಡು"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"ಸಿಂಕ್‌ ಈಗ ಕೊಂಚ ಸಮಸ್ಯೆ ಎದುರಿಸುತ್ತಿದೆ. ಶೀಘ್ರದಲ್ಲಿಯೇ ಅದು ಯಥಾಸ್ಥಿತಿಗೆ ಬರಲಿದೆ."</string>
-    <string name="add_account_label" msgid="7811707265834013767">"ಖಾತೆಯನ್ನು ಸೇರಿಸು"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"ಖಾತೆ ಸೇರಿಸು"</string>
     <string name="managed_profile_not_available_label" msgid="3489771164851107822">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ ಇನ್ನೂ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ತೆಗೆದುಹಾಕಿ"</string>
     <string name="background_data" msgid="5779592891375473817">"ಹಿನ್ನೆಲೆ ಡೇಟಾ"</string>
@@ -1931,7 +1931,7 @@
     <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="header_add_an_account" msgid="756108499532023798">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</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_message" product="tablet" msgid="1936147502815641161">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿರುವ ಅದರ ಎಲ್ಲ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇತರೆ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
@@ -2366,11 +2366,11 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"ಅಡಚಣೆಗಳು"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"ಕರೆಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು ಬಂದಾಗ"</string>
     <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವಾಗ"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"ಯಾವಾಗಲೂ ಅಡಚಣೆ ಮಾಡು"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ಆದ್ಯತೆಯ ಅಡಚಣೆಗಳನ್ನು ಮಾತ್ರ ಅನುಮತಿಸು"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕಲು ಅನುಮತಿಸು"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ರಿಂಗ್‌ಟೋನ್‌"</string>
@@ -2425,8 +2425,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ಸೂಕ್ಷ್ಮ"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ಮುಗಿದಿದೆ"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ನೀವು ಇದನ್ನು ಆಫ್‌ ಮಾಡುವವರೆಗೂ"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"ಆದ್ಯತೆಯ ಅಡಚಣೆಗಳು"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ಅಲಭ್ಯತೆ (ಆದ್ಯತೆಯ ಅಡಚಣೆಗಳು ಮಾತ್ರ)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು"</string>
+    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"ಡೌನ್‌ಟೈಮ್‌(ಕೇವಲ ಆದ್ಯತೆಯ ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ತಡೆಹಾಕು)"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"ದಿನಗಳು"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"ಸ್ವಯಂಚಾಲನೆ"</string>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index 7f28acc..98c68ce 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -135,7 +135,7 @@
     <item msgid="1701505390737218306">"Поврзано"</item>
     <item msgid="3189211552661432651">"Покането"</item>
     <item msgid="3206450250360237549">"Неуспешено"</item>
-    <item msgid="7785896708926971207">"Достапен"</item>
+    <item msgid="7785896708926971207">"Слободен"</item>
     <item msgid="2330782789550628803">"Надвор од опсег"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index d7f6829..a391f79 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -271,7 +271,7 @@
     <string name="battery_info_label" msgid="4132685016148679403">"Информации за батеријата"</string>
     <string name="display_label" msgid="8074070940506840792">"Екран"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Информации за таблет"</string>
-    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информации за телефон"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Информации за телефонот"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"УСБ меморија"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"СД картичка"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Подесувања за прокси"</string>
@@ -642,7 +642,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="5940801028985255304">"Притиснете го копчето Заштитено подесување на Wi-Fi на вашиот рутер. Тоа може да се нарекува „WPS“ или да го содржи овој симбол:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Притиснете го копчето „Заштитено подесување на Wi-Fi“ на вашиот рутер. Тоа може да се нарекува „WPS“ или да го содржи овој симбол:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Внесете ПИН <xliff:g id="NUMBER">%1$s</xliff:g> на вашиот Wi-Fi насочувач. Подесувањето може да трае и до две минути за да се заврши."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS успеа. Се поврзува со мрежата…"</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Поврзано со Wi-Fi мрежа <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
@@ -753,7 +753,7 @@
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> точка на пристап на пренослива Wi‑Fi"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна страница"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачини"</string>
@@ -819,7 +819,7 @@
     <string name="screen_timeout" msgid="4351334843529712571">"Режим на штедење"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> на неактивност"</string>
-    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избери тапет од"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Кога е приклучен, во мирување или кога се полни"</string>
@@ -913,7 +913,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"СД картичка"</string>
     <string name="memory_available" msgid="5052397223077021181">"Достапен"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Достапно (само за читање)"</string>
-    <string name="memory_size" msgid="6629067715017232195">"Вкупно простор"</string>
+    <string name="memory_size" msgid="6629067715017232195">"Вкупна меморија"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Пресметување..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Апликации (податоци за апликација и содржина на медиуми)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Медиуми"</string>
@@ -1116,7 +1116,7 @@
     <string name="location_access_summary" msgid="69031404093194341">"Дозволи апликациите кои побарале дозвола да ги користат твоите информации за локација"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Извори на локација"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"За таблет"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"За телефон"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"За телефонот"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Прикажи правни информации, статус, верзија на софтвер"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Соработници"</string>
@@ -1389,7 +1389,7 @@
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Повеќе јазици..."</string>
     <string name="testing" msgid="6584352735303604146">"Тестирање"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информации за таблет"</string>
-    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информации за телефон"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информации за телефонот"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Информации за батерија"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Брзо стартување"</string>
     <string name="quick_launch_summary" msgid="8101133819188001190">"Постави кратенки на тастатурата за стартување апликации"</string>
@@ -1558,7 +1558,7 @@
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Нема инсталирано услуги"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Не е обезбеден опис."</string>
     <string name="settings_button" msgid="3006713718908152930">"Подесувања"</string>
-    <string name="print_settings" msgid="4742428530112487843">"Се печати"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Печатење"</string>
     <string name="print_settings_title" msgid="3685449667822217816">"Услуги за печатење"</string>
     <string name="print_service_security_warning_title" msgid="2338435517408144841">"Употреби <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="print_service_security_warning_summary" msgid="7567131958613064363">"Вашиот документ може да помине преку еден или повеќе сервери на својот пат до печатачот."</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 0a3e040..b34f3a3 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -558,7 +558,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
     <string name="wifi_assistant_intro_setup" msgid="4605105515416995110">"Wi‑Fi അസിസ്‌റ്റന്റ്\nഅവതരിപ്പിക്കുന്നു"</string>
     <string name="wifi_assistant_no_thanks" msgid="2776983751990143934">"വേണ്ട, നന്ദി"</string>
-    <string name="wifi_assistant_setup" msgid="3772423650475730906">"സജ്ജീകരിക്കുക"</string>
+    <string name="wifi_assistant_setup" msgid="3772423650475730906">"സജ്ജമാക്കുക"</string>
     <string name="wifi_assistant_card_message" msgid="107811647784658536">"ഒരു Wi‑Fi അസിസ്‌റ്റന്റ് ഉപയോഗിച്ച് ലഭ്യമായ നെറ്റ്‌വർക്കുകളിൽ യാന്ത്രികമായി കണക്‌റ്റുചെയ്യുക."</string>
     <string name="wifi_assistant_title" msgid="2553267316621598101">"Wi‑Fi അസിസ്‌റ്റന്റ്"</string>
     <string name="wifi_assistant_title_message" msgid="6240721017579074015">"ലഭ്യമായതിൽ മികച്ച Wi‑Fi ലേക്ക് നിങ്ങളെ <xliff:g id="WIFI_ASSISTANT">%1$s</xliff:g> യാന്ത്രികമായി കണക്‌റ്റുചെയ്യുന്നു"</string>
@@ -1596,7 +1596,7 @@
     <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - AC-യിൽ പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - വയർലെസ് വഴി പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"പൂർണ്ണമായും ചാർജ്ജ് ആയതുമുതൽ ഉപയോഗിച്ചവ"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"പൂർണ്ണമായും ചാർജ് ആയതുമുതൽ ഉപയോഗിച്ചവ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"പുനഃസജ്ജമാക്കിയതിന് ശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ബാറ്ററിയിൽ <xliff:g id="TIME">%1$s</xliff:g>"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 4abc276..4b278a0 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -1590,13 +1590,13 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> शिल्लक"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"चार्ज करण्यासाठी <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - अंदाजे. <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string>
+    <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - अंदाजे <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string>
     <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
     <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> एसी वर पूर्ण होईपर्यंत"</string>
     <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - USB वर पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - वायरलेसवरून पूर्ण होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"शेवटचे पूर्ण चार्ज झाल्यापासून वापरा"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"पूर्ण चार्ज झाल्यानंतरचा वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"रीसेट केल्यापासून बॅटरी वापर"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"बॅटरीवरील <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2370,7 +2370,7 @@
     <string name="zen_mode_option_title" msgid="5061978632306007914">"कॉल आणि सूचना येतात तेव्‍हा"</string>
     <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"सूचना येतात तेव्हा"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"नेहमी व्यत्यय आणा"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवळ प्राधान्य व्‍यत्‍ययांना अनुमती द्या"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"केवळ प्राधान्य दिलेल्या व्‍यत्‍ययांना अनुमती द्या"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"व्यत्यय आणू नका"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफॉल्ट सूचना रींगटोन"</string>
@@ -2417,7 +2417,7 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"अवरोधित करा"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"या अॅपकडील सूचना कधीही दर्शवू नका"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"प्राधान्य"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"सूचना सूचीच्या शीर्षस्थानी दर्शवा आणि डिव्हाइस प्राथमिक व्यत्ययांवर सेट केलेले असतानाच त्यांना येऊ द्या"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"सूचना सूचीच्या शीर्षस्थानी दर्शवा आणि डिव्हाइस प्राधान्य दिलेल्या व्यत्ययांवर सेट केलेले असताना त्यांना येऊ द्या"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"संवेदनशील"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"डिव्हाइस लॉक केलेले असताना, या अॅपच्या सूचनांमधील कोणतीही संवेदशनशील सामग्री लपवा"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
@@ -2425,8 +2425,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण झाले"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"आपण हे बंद करेपर्यंत"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राधान्य व्यत्यय"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"कार्य न करण्‍याचा कालावधी (प्राधान्य व्यत्यय केवळ)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"प्राधान्य दिलेले व्यत्यय"</string>
+    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"डाउनटाइम (केवळ प्राधान्य दिलेले व्यत्यय)"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"दिवस"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"काहीही नाही"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"स्वयंचलन"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 68f6ca9..d0ece1d 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -277,7 +277,7 @@
     <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
     <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
     <item msgid="6325739889222559394">"hlasitosť médií"</item>
-    <item msgid="5762123934816216821">"hlasitosť budíka"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíkov"</item>
     <item msgid="785049718065337473">"hlasitosť upozornení"</item>
     <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
     <item msgid="2029227495214047094">"zakázať režim spánku"</item>
@@ -326,7 +326,7 @@
     <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
     <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
     <item msgid="7878027809189330917">"Hlasitosť médií"</item>
-    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíkov"</item>
     <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
     <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
     <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
@@ -505,8 +505,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"Vypnuté"</item>
-    <item msgid="5656544177755411222">"Obmedzený počet prerušení"</item>
-    <item msgid="8735337502532332056">"Žiadne prerušenia"</item>
+    <item msgid="5656544177755411222">"Obmedzený počet vyrušení"</item>
+    <item msgid="8735337502532332056">"Žiadne vyrušenia"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normálny"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c19eda4..0fa74ca 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -333,7 +333,7 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Pri odomykaní vyžadovať žmurknutie okom"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automaticky zamknúť"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po prechode do spánku"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po režime spánku, ak odomknutie nie je udržované pomocou <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> po režime spánku, ak odomknutie nie je udržované funkciou <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Zobrazovať vlastníka na uzamknutej obrazovke"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlastníkovi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiv. miniaplikácie"</string>
@@ -1167,7 +1167,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Zobrazovať vzor"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrovanie pri dotyku"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Zamknúť tlačidlom napájania"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Ak odomknutie nie je udržované pomocou <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Ak odomknutie nie je udržované funkciou <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Nastaviť bezpečnostný vzor"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Zmena bezpečnostného vzoru"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Bezpečnostný vzor obrazovky nakreslite takto"</string>
@@ -2183,7 +2183,7 @@
     <string name="user_add_user_message_long" msgid="718192651887726259">"Vytvorením ďalších používateľov môžete toto zariadenie zdieľať s inými ľuďmi. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť vlastnými aplikáciami, tapetou atď. Používatelia tiež môžu upraviť nastavenia zariadenia (napr. Wi-Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Zaistite, aby by si daná osoba mohla zariadenie prevziať a nastaviť svoj priestor"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Uistite sa, že je daná osoba k dispozícii a môže si na zariadení nastaviť svoj priestor."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastaviť profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nastaviť teraz"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Teraz nie"</string>
@@ -2197,11 +2197,11 @@
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"Odstrániť používateľa?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Odstrániť tento profil?"</string>
-    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Odstrániť prac. profil?"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Odstrániť pracovný profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Prídete o miesto v pamäti a údaje v tomto tablete. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Prídete o miesto v pamäti a údaje v tomto telefóne. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"Odstránia sa všetky aplikácie a údaje."</string>
-    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"Všetky aplikácie a údaje v tomto profile budú odstránené"</string>
+    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"Všetky aplikácie a údaje v tomto profile budú odstránené."</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Odstránia sa všetky aplikácie a údaje."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Pridáv. nového používateľa..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Odstrániť používateľa"</string>
@@ -2283,8 +2283,8 @@
     <string name="wizard_back" msgid="5567007959434765743">"Späť"</string>
     <string name="wizard_next" msgid="3606212602795100640">"Ďalej"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Dokončiť"</string>
-    <string name="user_image_take_photo" msgid="1280274310152803669">"Vytvoriť fotografiu"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotografiu z Galérie"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Odfotiť"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotku z Galérie"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"Vybrať fotku"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM karty"</string>
@@ -2345,7 +2345,7 @@
     <string name="keywords_factory_data_reset" msgid="3693730656843989732">"vymazať odstrániť"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"tlačiareň"</string>
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"zvukový signál reproduktora"</string>
-    <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nie nerušiť prerušiť prerušenie prestávka"</string>
+    <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"nie nerušiť vyrušiť vyrušenie prestávka"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
     <string name="keywords_location" msgid="782326973714313480">"v blízkosti poloha história nahlasovanie"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"presnosť"</string>
@@ -2363,14 +2363,14 @@
     <string name="default_sound" msgid="8821684447333687810">"Predvolený zvuk"</string>
     <string name="notification_settings" msgid="8791730980212496561">"Zvuk a upozornenia"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Hlasitosť médií"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíka"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíkov"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitosť zvonenia"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</string>
-    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Prerušenia"</string>
+    <string name="zen_mode_settings_title" msgid="7014915558669122902">"Vyrušenia"</string>
     <string name="zen_mode_option_title" msgid="5061978632306007914">"Pri prichádzajúcom hovore alebo upozornení"</string>
     <string name="zen_mode_option_title_novoice" msgid="6680706009915204785">"Pri prijatí upozornení"</string>
     <string name="zen_mode_option_off" msgid="3167702608910820883">"Vždy prerušiť"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povoliť iba prioritné prerušenia"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="2320263300561981257">"Povoliť iba prioritné vyrušenia"</string>
     <string name="zen_mode_option_no_interruptions" msgid="5664234817617301449">"Neprerušovať"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"Predvolený tón upozornení"</string>
@@ -2417,7 +2417,7 @@
     <string name="app_notification_block_title" msgid="172237877395761371">"Blokovať"</string>
     <string name="app_notification_block_summary" msgid="9049487483231233726">"Nikdy nezobrazovať upozornenia z tejto aplikácie"</string>
     <string name="app_notification_priority_title" msgid="1967189807102076587">"Prioritné"</string>
-    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Zobrazovať upozornenia v hornej časti zoznamu a povoliť ich aj v prípade, keď sú na zariadení nastavené iba prioritné prerušenia"</string>
+    <string name="app_notification_priority_summary" msgid="7513344552201639232">"Zobrazovať upozornenia v hornej časti zoznamu a povoliť ich aj v prípade, keď sú na zariadení nastavené iba prioritné vyrušenia"</string>
     <string name="app_notification_sensitive_title" msgid="7707233094233553192">"Citlivé"</string>
     <string name="app_notification_sensitive_summary" msgid="2505314249332316395">"Skryť akýkoľvek citlivý obsah z upozornení tejto aplikácie v prípade, že je zariadenie uzamknuté"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokované"</string>
@@ -2425,8 +2425,8 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokým túto funkciu nevypnete"</string>
-    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritné prerušenia"</string>
-    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Prestoje (iba prioritné prerušenia)"</string>
+    <string name="zen_mode_important_category" msgid="8123274463331022993">"Prioritné vyrušenia"</string>
+    <string name="zen_mode_downtime_category" msgid="4730179065426038108">"Prestoje (iba prioritné vyrušenia)"</string>
     <string name="zen_mode_downtime_days" msgid="3361856902633311616">"Dni"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"Žiadne"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"Automatizácia"</string>
@@ -2440,7 +2440,7 @@
     <string name="zen_mode_from_contacts" msgid="8751503728985572786">"Iba kontakty"</string>
     <string name="zen_mode_from_starred" msgid="2168651127340381533">"Kontakty s hviezdičkou"</string>
     <string name="zen_mode_events" msgid="2456995649835437565">"Udalosti a pripomenutia"</string>
-    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Budíky sú vždy považované za prioritné prerušenia"</string>
+    <string name="zen_mode_alarm_info" msgid="3195430795475795398">"Budíky sú vždy považované za prioritné vyrušenia"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnúť"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
@@ -2455,7 +2455,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pripnutie k obrazovke"</string>
-    <string name="screen_pinning_description" msgid="3022868253807792488">"Po zapnutí tohto nastavenia môžete zariadenie prepnúť do stavu, v ktorom sa bude zobrazovať iba aktuálna obrazovka.\n\nPostup pripnutia obrazovky:\n\n1. Zapnite toto nastavenie.\n\n2. Otvorte požadovanú aplikáciu.\n\n3. Dotknite sa tlačidla Nedávne.\n\n4. Dotknite sa ikony špendlíka."</string>
+    <string name="screen_pinning_description" msgid="3022868253807792488">"Po zapnutí tohto nastavenia môžete zariadenie prepnúť do stavu, v ktorom sa bude zobrazovať iba aktuálna obrazovka.\n\nPostup pripnutia k obrazovke:\n\n1. Zapnite toto nastavenie.\n\n2. Otvorte požadovanú aplikáciu.\n\n3. Dotknite sa tlačidla Nedávne.\n\n4. Dotknite sa ikony špendlíka."</string>
     <string name="managed_user_title" msgid="8101244883654409696">"Pracovný profil"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"Pri otáčaní zariadenia"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index abc25ee..d9b9812 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -263,7 +263,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inii-scan ng SD card para sa media…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB strage na-mount read-only."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Na-mount ang SD card na read-only."</string>
-    <string name="skip_label" msgid="47510779345218297">"Lktaw"</string>
+    <string name="skip_label" msgid="47510779345218297">"Laktawan"</string>
     <string name="next_label" msgid="4693520878012668114">"Susunod"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Wika"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Pumili ng aktibidad"</string>
@@ -657,7 +657,7 @@
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Lakas ng signal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Katayuan"</string>
-    <string name="wifi_speed" msgid="3526198708812322037">"I-link ang bilis"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"Bilis ng link"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Dalas"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP address"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Pamamaraang EAP"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9544189..559005d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1220,10 +1220,10 @@
     <string name="enable_compatibility" msgid="5806819252068617811">"Масштабувати програму"</string>
     <string name="unknown" msgid="1592123443519355854">"Невідомо"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за іменем"</string>
-    <string name="sort_order_size" msgid="7024513286636502362">"Сорт. за розм."</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Сортувати за розміром"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показати запущені служби"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налашт-ня програм"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налаштування"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Буде скинуто всі налаштування для:\n\n "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"програм за умовчанням для виконання дій"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n" "<li>"усіх обмежень щодо дозволів"</li>\n\n" Жодні дані програм не буде втрачено."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути програми"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fff1c92..9142150 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -699,9 +699,9 @@
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"警告：如果略過 Wi-Fi 設定，平板電腦將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"警告：如果略過 Wi-Fi 設定，裝置將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
     <string name="wifi_skipped_message" product="default" msgid="6084295135297772350">"警告：如果略過 Wi-Fi 設定，手機將只能透過流動數據連線，以作初始下載及更新。如要避免產生數據傳輸費用，請連線至 Wi-Fi 網絡。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告：如果略過 Wi-Fi 設定，平板電腦將無法連線至互聯網，以作任何初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告：如果略過 Wi-Fi 設定，裝置將無法連線至互聯網，以作任何初始下載或更新。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告：如果略過 Wi-Fi 設定，手機將無法連線至互聯網，以作任何初始下載或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="2393880108322835846">"警告：如果略過 Wi-Fi 設定，平板電腦將無法連線至互聯網，以進行初始下載或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="device" msgid="1707391993265558787">"警告：如果略過 Wi-Fi 設定，裝置將無法連線至互聯網，以進行初始下載或更新。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1556858507920033022">"警告：如果略過 Wi-Fi 設定，手機將無法連線至互聯網，以進行初始下載或更新。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板電腦無法連接這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="device" msgid="8870885845666880869">"裝置無法連線至這個 Wi-Fi 網絡。"</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手機無法連接這個 Wi-Fi 網絡。"</string>
@@ -765,7 +765,7 @@
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
-    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"不支援工作設定檔"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"不支援公司檔案"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"預設通知音效"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"媒體"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"設定音樂和影片的音量"</string>
@@ -1077,8 +1077,8 @@
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"流動數據計劃"</string>
     <string name="sms_application_title" msgid="6134351177937015839">"預設短訊應用程式"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更短訊應用程式？"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"改用「<xliff:g id="NEW_APP">%1$s</xliff:g>」為您的短訊應用程式，以取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」？"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」為您的短訊應用程式？"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"將 <xliff:g id="NEW_APP">%1$s</xliff:g> 設為您的短訊應用程式，而不使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g>？"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"將 <xliff:g id="NEW_APP">%s</xliff:g> 設為您的短訊應用程式？"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"變更 Wi‑Fi Assistant？"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"使用「<xliff:g id="NEW_APP">%1$s</xliff:g>」(取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」) 管理您的網絡連線？"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理您的網絡連線？"</string>
@@ -1855,7 +1855,7 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"撤銷"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"裝置管理員"</string>
     <string name="no_device_admins" msgid="702695100241728775">"沒有可用的裝置管理員"</string>
-    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"如要停止讓 <xliff:g id="APP_NAME">%1$s</xliff:g> 存取您的工作設定檔，請前往 [設定] &gt; [帳戶] 移除設定檔"</string>
+    <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"如要停止讓 <xliff:g id="APP_NAME">%1$s</xliff:g> 存取您的公司檔案，請前往 [設定] &gt; [帳戶] 移除設定檔"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"公司"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"沒有信任的代理程式可供使用"</string>
@@ -1908,8 +1908,8 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"同步"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"同步處理目前發生問題。將於短時間內恢復。"</string>
     <string name="add_account_label" msgid="7811707265834013767">"新增帳戶"</string>
-    <string name="managed_profile_not_available_label" msgid="3489771164851107822">"工作設定檔未能使用"</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"移除工作設定檔"</string>
+    <string name="managed_profile_not_available_label" msgid="3489771164851107822">"公司檔案未能使用"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"移除公司檔案"</string>
     <string name="background_data" msgid="5779592891375473817">"背景資料"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"應用程式隨時可以同步處理、傳送和接收資料"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"您要停用背景資料嗎？"</string>
@@ -2169,12 +2169,12 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人檔案"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"限制存取的個人檔案"</string>
-    <string name="user_summary_managed_profile" msgid="7369539529693048111">"工作設定檔"</string>
+    <string name="user_summary_managed_profile" msgid="7369539529693048111">"公司檔案"</string>
     <string name="user_need_lock_message" msgid="2596365678651842785">"建立限制存取的個人檔案前，您必須先設定上鎖畫面來保護您的應用程式和個人資料。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"設定上鎖畫面"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未設定"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"未設定 - 限制存取的個人檔案"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"尚未設定 - 工作設定檔"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"尚未設定 - 公司檔案"</string>
     <string name="user_owner" msgid="3879126011135546571">"擁有者"</string>
     <string name="user_you" msgid="1639158809315025986">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
@@ -2201,11 +2201,11 @@
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"移除這位使用者？"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"移除這個設定檔？"</string>
-    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"要移除工作設定檔嗎？"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"要移除公司檔案嗎？"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您將會失去在這部平板電腦上的空間和資料，您無法復原這項操作。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您將會失去在這部手機上的空間和資料，您無法復原這項操作。"</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"所有應用程式和資料都會被刪除。"</string>
-    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"這個工作設定檔中的所有應用程式和資料都會被刪除。"</string>
+    <string name="work_profile_confirm_remove_message" msgid="7593793549364168783">"這個公司檔案中的所有應用程式和資料都會被刪除。"</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"所有應用程式和資料都會被刪除。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在新增使用者…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"刪除使用者"</string>
@@ -2245,7 +2245,7 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 碼"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
-    <string name="help_label" msgid="6886837949306318591">"說明與意見反映"</string>
+    <string name="help_label" msgid="6886837949306318591">"說明和意見反映"</string>
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"極嚴重威脅"</string>
@@ -2460,7 +2460,7 @@
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
     <string name="screen_pinning_description" msgid="3022868253807792488">"開啟這項設定時，可讓裝置鎖定在目前的螢幕。\n\n如何固定螢幕：\n\n1. 開啟這項設定。\n\n2. 開啟應用程式。\n\n3. 輕觸 [最近] 按鈕。\n\n4. 輕觸圖釘圖示。"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
+    <string name="managed_user_title" msgid="8101244883654409696">"公司檔案"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
     <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4401661..84d32a2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2431,7 +2431,7 @@
     <string name="zen_mode_default_option" msgid="6940069025071935243">"手動關閉這項設定前一律啟用"</string>
     <string name="zen_mode_important_category" msgid="8123274463331022993">"優先干擾"</string>
     <string name="zen_mode_downtime_category" msgid="4730179065426038108">"停機時間 (僅限優先干擾)"</string>
-    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"天"</string>
+    <string name="zen_mode_downtime_days" msgid="3361856902633311616">"星期幾"</string>
     <string name="zen_mode_downtime_days_none" msgid="8454857121193391322">"無"</string>
     <string name="zen_mode_automation_category" msgid="4653551005950835761">"自動化"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38ad820..e38ed39 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4825,15 +4825,6 @@
     <string name="show_all_anrs_summary">Show App Not Responding dialog
         for background apps</string>
 
-    <!-- UI debug setting: webview data reduction proxy [CHAR LIMIT=100] -->
-    <string name="dev_settings_use_google_settings">Please use GoogleSettings app for this operation</string>
-
-    <!-- UI debug setting: webview data reduction proxy [CHAR LIMIT=50] -->
-    <string name="webview_data_reduction_proxy">Reduce WebView Network Usage</string>
-    <!-- UI debug setting: webview data reduction proxy summary [CHAR LIMIT=200] -->
-    <string name="webview_data_reduction_proxy_summary">Reduce network usage by
-        proxying WebView connections through Google compression servers</string>
-
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 807ae8b..128aa5f 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -311,10 +311,6 @@
             android:title="@string/show_all_anrs"
             android:summary="@string/show_all_anrs_summary"/>
 
-        <CheckBoxPreference
-            android:key="webview_data_reduction_proxy"
-            android:title="@string/webview_data_reduction_proxy"
-            android:summary="@string/webview_data_reduction_proxy_summary"/>
      </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index addb695..1e29d22 100644
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -71,6 +71,7 @@
                 mProtectFromCheckedChange = true;
                 rb.setChecked(isChecked);
                 mProtectFromCheckedChange = false;
+                rb.setVisibility(View.VISIBLE);
             } else {
                 rb.setVisibility(View.GONE);
             }
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 8bc4b64..f5704c1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -31,9 +31,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
-import android.database.Cursor;
 import android.hardware.usb.IUsbManager;
-import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
@@ -61,7 +59,6 @@
 import android.view.IWindowManager;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.webkit.WebView;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -154,11 +151,6 @@
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
-    private static final String WEBVIEW_DATA_REDUCTION_PROXY_KEY = "webview_data_reduction_proxy";
-    // GoogleSetting name for the data reduction proxy setting.
-    // Setting type: int ( 0 = disallow, 1 = allow )
-    private static final String WEBVIEW_DATA_REDUCTION_PROXY = "use_webview_data_reduction_proxy";
-
     private static final String PROCESS_STATS = "proc_stats";
 
     private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
@@ -171,11 +163,6 @@
 
     private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
 
-    // The setting Uri. Used when querying GoogleSettings.
-    private static final Uri GOOGLE_SETTINGS_CONTENT_URI = Uri.parse("content://com.google.settings/partner");
-    private static final String GOOGLE_SETTINGS_COMPONENT = "com.google.android.gms";
-    private static final String GOOGLE_SETTINGS_ACTIVITY = ".app.settings.GoogleSettingsActivity";
-
     private static String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
 
     private IWindowManager mWindowManager;
@@ -242,8 +229,6 @@
 
     private CheckBoxPreference mShowAllANRs;
 
-    private CheckBoxPreference mWebViewDataReductionProxy;
-
     private PreferenceScreen mProcessStats;
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
 
@@ -380,15 +365,6 @@
 
         mProcessStats = (PreferenceScreen) findPreference(PROCESS_STATS);
         mAllPrefs.add(mProcessStats);
-
-        mWebViewDataReductionProxy = findAndInitCheckboxPref(WEBVIEW_DATA_REDUCTION_PROXY_KEY);
-        mWebViewDataReductionProxy.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    @Override
-                    public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        return handleDataReductionProxyPreferenceChange();
-                    }
-                });
     }
 
     private ListPreference addListPreference(String prefKey) {
@@ -557,7 +533,6 @@
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
-        updateWebViewDataReductionProxyOptions();
         updateVerifyAppsOverUsbOptions();
         updateBugreportOptions();
         updateForceRtlOptions();
@@ -1302,73 +1277,6 @@
             getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
-    // Reads the googlesetting and converts to an int. Throws an exception if GoogleSettings
-    // provider does not exist or if the setting name cannot be found.
-    private int getGoogleSettingValue(String name) throws Exception {
-        String value = null;
-        Cursor c = null;
-        try {
-            ContentResolver resolver = getActivity().getContentResolver();
-            c = resolver.query(GOOGLE_SETTINGS_CONTENT_URI, new String[] { "value" },
-                    "name=?", new String[]{ name }, null);
-            if (c != null && c.moveToNext()) value = c.getString(0);
-        } finally {
-            if (c != null) c.close();
-        }
-        // Throw an exception if value is null. This will indicate that setting is not found.
-        return Integer.parseInt(value);
-    }
-
-    private boolean handleDataReductionProxyPreferenceChange() {
-        int val;
-        try {
-            val = getGoogleSettingValue(WEBVIEW_DATA_REDUCTION_PROXY);
-        } catch (Exception e) {
-            // Accessing GoogleSettings failed. Use the developer setting.
-            return true;
-        }
-
-        Intent i = new Intent();
-        i.setClassName(GOOGLE_SETTINGS_COMPONENT,
-                GOOGLE_SETTINGS_COMPONENT + GOOGLE_SETTINGS_ACTIVITY);
-        try {
-            startActivity(i);
-        } catch (android.content.ActivityNotFoundException ex) {
-            // We found the GoogleSetting but for some reason activity not found.
-            // Do our best and put an alert dialog
-            new AlertDialog.Builder(getActivity()).setMessage(
-                    getActivity().getResources().getString(
-                        R.string.dev_settings_use_google_settings))
-                        .setPositiveButton(android.R.string.ok, this)
-                        .show();
-        }
-        // Use GoogleSettings to set.
-        return false;
-    }
-
-    private void writeWebViewDataReductionProxyOptions() {
-        Settings.Secure.putInt(getActivity().getContentResolver(),
-                Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY,
-                mWebViewDataReductionProxy.isChecked() ? 1 : 0);
-        Intent intent = new Intent(WebView.DATA_REDUCTION_PROXY_SETTING_CHANGED);
-        // Broadcast to all apps running as current user.
-        getActivity().sendBroadcastAsUser(intent, UserHandle.CURRENT);
-    }
-
-    private void updateWebViewDataReductionProxyOptions() {
-        int val = -1;
-        try {
-              val = getGoogleSettingValue(WEBVIEW_DATA_REDUCTION_PROXY);
-        } catch (Exception e) {
-            // Accessing GoogleSettings failed. Use the developer setting
-        }
-        if (val == -1) {
-            val = Settings.Secure.getInt(getActivity().getContentResolver(),
-                    Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0);
-        }
-        updateCheckBox(mWebViewDataReductionProxy, val != 0);
-    }
-
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         if (switchView != mSwitchBar.getSwitch()) {
@@ -1488,8 +1396,6 @@
             writeImmediatelyDestroyActivitiesOptions();
         } else if (preference == mShowAllANRs) {
             writeShowAllANRsOptions();
-        } else if (preference == mWebViewDataReductionProxy) {
-            writeWebViewDataReductionProxyOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
         } else if (preference == mForceMsaa) {
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 4efbe02..5ec513f 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -316,7 +316,11 @@
             final TextView title = (TextView) convertView.findViewById(android.R.id.title);
             final UserHandle profile = getGroup(groupPosition);
             final UserInfo userInfo = mUserManager.getUserInfo(profile.getIdentifier());
-            title.setText(userInfo.name);
+            if (userInfo.isManagedProfile()) {
+                title.setText(R.string.category_work);
+            } else {
+                title.setText(R.string.category_personal);
+            }
             title.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
 
             return convertView;