diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 9546b09cf5f..fe5e71e4910 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -138,12 +138,14 @@
     <item msgid="477015974247590543">"1 hour"</item>
     <item msgid="5198271470953124739">"Never time out"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="834764606877643762">"Use System Default: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="4428462068012149533">"1"</item>
+    <item msgid="2620881722754455257">"2"</item>
+    <item msgid="402831176731135702">"3"</item>
+    <item msgid="4923580285404888038">"4"</item>
+    <item msgid="3643103044864989283">"5"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Poor"</item>
     <item msgid="2042505933058940139">"Poor"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index aa5af663b73..a3d5b54105d 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -291,10 +291,10 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"No matching activities found."</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
     <string name="calls_title" msgid="3544471959217176768">"Calls"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS messages"</string>
@@ -750,7 +750,7 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz band not available in this country"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In Airplane mode"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"Open network notification"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notify when a high‑quality public network is available"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
@@ -925,7 +925,7 @@
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi hotspot setup"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
-    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Unavailable because aeroplane mode is turned on"</string>
+    <string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Unavailable because airplane mode is turned on"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi Calling"</string>
     <string name="wifi_calling_suggestion_title" msgid="7766895085362824508">"Extend call coverage with Wi‑Fi"</string>
     <string name="wifi_calling_suggestion_summary" msgid="6460250990899143406">"Turn on Wi‑Fi calling"</string>
@@ -1443,8 +1443,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Location for work profile"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"App-level permissions"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
-    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
-    <skip />
+    <string name="location_recent_location_requests_see_all" msgid="9063541547120162593">"See all"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Location services"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"High battery use"</string>
@@ -2160,7 +2159,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery used when tablet is idle"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Battery used when phone is idle"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Battery used by mobile radio"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Switch to aeroplane mode to save power in areas with no mobile coverage"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Switch to airplane mode to save power in areas with no cell coverage"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Battery used by the flashlight"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Battery used by the camera"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Battery used by the display and backlight"</string>
@@ -2317,8 +2316,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Before you can use credential storage, your device needs to have a secure lock screen"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"SET LOCK"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps with usage access"</string>
-    <!-- no translation found for emergency_tone_title (254495218194925271) -->
-    <skip />
+    <string name="emergency_tone_title" msgid="254495218194925271">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
@@ -2927,12 +2925,9 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
-    <skip />
-    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
-    <skip />
-    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
-    <skip />
+    <string name="emergency_tone_silent" msgid="3750231842974733677">"Silence"</string>
+    <string name="emergency_tone_alert" msgid="8523447641290736852">"Tones"</string>
+    <string name="emergency_tone_vibrate" msgid="2278872257053690683">"Vibrations"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Power on sounds"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Never"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3112,9 +3107,7 @@
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Choose rule type"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Delete \"<xliff:g id="RULE">%1$s</xliff:g>\" rule?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Delete"</string>
-    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Rule type"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Unknown"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configure rule"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"These settings can\'t be changed at the moment. An app (<xliff:g id="APP_NAME">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behaviour."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"These settings can\'t be changed at the moment. An app has automatically turned on Do Not Disturb with custom behaviour."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"These settings can\'t be changed at the moment. Do Not Disturb was manually turned on with custom behaviour."</string>
@@ -3512,7 +3505,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"Hide"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Portable Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> is active, Wi-Fi for this device is turned off."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Aeroplane mode is on"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Airplane mode is on"</string>
     <string name="condition_airplane_summary" msgid="3738805058182535606">"Wi-Fi, Bluetooth and mobile network are turned off. You can\'t make phone calls or connect to the Internet."</string>
     <string name="condition_zen_title" msgid="2897779738211625">"Do Not Disturb is on"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Battery Saver is on"</string>
@@ -3863,14 +3856,9 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
-    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
-    <skip />
-    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
-    <skip />
+    <string name="change_wifi_state_title" msgid="2640523995824431999">"Toggle Wi-Fi on and off"</string>
+    <string name="keywords_change_wifi_state" msgid="1439807171750715923">"toggle Wi-Fi on and off"</string>
+    <string name="change_wifi_state_app_detail_title" msgid="1022360625069880993">"Toggle Wi-Fi on and off"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="724818064600933957">"Allow toggle Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="2511212187129042304">"Allow this app to change Wi-Fi state including connecting to Wi-Fi and turing Wi-Fi on and off."</string>
 </resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index a04f1ad93ca..3dfcf58e8e1 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -138,12 +138,14 @@
     <item msgid="477015974247590543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎1 hour‎‏‎‎‏‎"</item>
     <item msgid="5198271470953124739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎Never time out‎‏‎‎‏‎"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="834764606877643762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎Use System Default: ‎‏‎‎‏‏‎<xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</item>
+    <item msgid="4428462068012149533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎1‎‏‎‎‏‎"</item>
+    <item msgid="2620881722754455257">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎2‎‏‎‎‏‎"</item>
+    <item msgid="402831176731135702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎3‎‏‎‎‏‎"</item>
+    <item msgid="4923580285404888038">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎4‎‏‎‎‏‎"</item>
+    <item msgid="3643103044864989283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎5‎‏‎‎‏‎"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎Poor‎‏‎‎‏‎"</item>
     <item msgid="2042505933058940139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎Poor‎‏‎‎‏‎"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 0c46a91e8c2..3568cbfd54b 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1442,8 +1442,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎Location for work profile‎‏‎‎‏‎"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎App-level permissions‎‏‎‎‏‎"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎Recent location requests‎‏‎‎‏‎"</string>
-    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
-    <skip />
+    <string name="location_recent_location_requests_see_all" msgid="9063541547120162593">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎See all‎‏‎‎‏‎"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎No apps have requested location recently‎‏‎‎‏‎"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎Location services‎‏‎‎‏‎"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎High battery use‎‏‎‎‏‎"</string>
@@ -2316,8 +2315,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎Before you can use credential storage, your device need to have a secure lock screen‎‏‎‎‏‎"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎SET LOCK‎‏‎‎‏‎"</string>
     <string name="usage_access_title" msgid="332333405495457839">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎Apps with usage access‎‏‎‎‏‎"</string>
-    <!-- no translation found for emergency_tone_title (254495218194925271) -->
-    <skip />
+    <string name="emergency_tone_title" msgid="254495218194925271">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎Emergency dialing signal‎‏‎‎‏‎"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎Set behavior when an emergency call is placed‎‏‎‎‏‎"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎Backup‎‏‎‎‏‎"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎Backup &amp; restore‎‏‎‎‏‎"</string>
@@ -2926,12 +2924,9 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎Dock speaker plays‎‏‎‎‏‎"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎All audio‎‏‎‎‏‎"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎Media audio only‎‏‎‎‏‎"</string>
-    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
-    <skip />
-    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
-    <skip />
-    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
-    <skip />
+    <string name="emergency_tone_silent" msgid="3750231842974733677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎Silence‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_alert" msgid="8523447641290736852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎Tones‎‏‎‎‏‎"</string>
+    <string name="emergency_tone_vibrate" msgid="2278872257053690683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎Vibrations‎‏‎‎‏‎"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎Power on sounds‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎Never‎‏‎‎‏‎"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3111,9 +3106,7 @@
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎Choose rule type‎‏‎‎‏‎"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎Delete “‎‏‎‎‏‏‎<xliff:g id="RULE">%1$s</xliff:g>‎‏‎‎‏‏‏‎” rule?‎‏‎‎‏‎"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎Delete‎‏‎‎‏‎"</string>
-    <string name="zen_mode_rule_type" msgid="2289413469580142888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎Rule type‎‏‎‎‏‎"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎Unknown‎‏‎‎‏‎"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎Configure rule‎‏‎‎‏‎"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎These settings can\'t be changed right now. An app (‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎) has automatically turned on Do Not Disturb with custom behavior.‎‏‎‎‏‎"</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior.‎‏‎‎‏‎"</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎These settings can\'t be changed right now. Do Not Disturb was manually turned on with custom behavior.‎‏‎‎‏‎"</string>
@@ -3862,14 +3855,9 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎Use Bluetooth when driving‎‏‎‎‏‎"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎Turn on Bluetooth automatically when driving‎‏‎‎‏‎"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎See Android 8.0 battery settings‎‏‎‎‏‎"</string>
-    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
-    <skip />
-    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
-    <skip />
+    <string name="change_wifi_state_title" msgid="2640523995824431999">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎Toggle wifi on and off‎‏‎‎‏‎"</string>
+    <string name="keywords_change_wifi_state" msgid="1439807171750715923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎toggle wifi on and off‎‏‎‎‏‎"</string>
+    <string name="change_wifi_state_app_detail_title" msgid="1022360625069880993">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎Toggle wifi on and off‎‏‎‎‏‎"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="724818064600933957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎Allow toggle wifi‎‏‎‎‏‎"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="2511212187129042304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎Allow this app to change wifi state including connecting to wifi and turing wifi on and off.‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index ca1ae442480..fbe981dbf1c 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -138,12 +138,14 @@
     <item msgid="477015974247590543">"Une heure"</item>
     <item msgid="5198271470953124739">"Aucun délai"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="834764606877643762">"Utiliser la valeur par défaut du système : <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="4428462068012149533">"1"</item>
+    <item msgid="2620881722754455257">"2"</item>
+    <item msgid="402831176731135702">"3"</item>
+    <item msgid="4923580285404888038">"4"</item>
+    <item msgid="3643103044864989283">"5"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
     <item msgid="2042505933058940139">"Faible"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0bf750ef7d7..68c374c0932 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1443,8 +1443,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Emplacement du profil pro"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autorisations au niveau applis"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes de localisation récentes"</string>
-    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
-    <skip />
+    <string name="location_recent_location_requests_see_all" msgid="9063541547120162593">"Tout afficher"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune demande d\'accès à votre position n\'a récemment été envoyée pour une application."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Services de localisation"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Forte utilisation de la batterie"</string>
@@ -2317,8 +2316,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un écran de verrouillage sécurisé sur votre appareil"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERROUILLAGE"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Applis accédant aux infos utilisation"</string>
-    <!-- no translation found for emergency_tone_title (254495218194925271) -->
-    <skip />
+    <string name="emergency_tone_title" msgid="254495218194925271">"Signal de numérotation d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sauvegarde"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
@@ -2927,12 +2925,9 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Sons haut-parleurs sta. accueil"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tout l\'audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio des contenus multimédias seulement"</string>
-    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
-    <skip />
-    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
-    <skip />
-    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
-    <skip />
+    <string name="emergency_tone_silent" msgid="3750231842974733677">"Silence"</string>
+    <string name="emergency_tone_alert" msgid="8523447641290736852">"Tonalités"</string>
+    <string name="emergency_tone_vibrate" msgid="2278872257053690683">"Vibrations"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sons de mise en route"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Jamais"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3112,9 +3107,7 @@
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Sélectionner le type de règle"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Supprimer la règle \"<xliff:g id="RULE">%1$s</xliff:g>\" ?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
-    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Inconnu"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer une règle"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"Vous ne pouvez pas modifier ces paramètres pour le moment. Une application (<xliff:g id="APP_NAME">%1$s</xliff:g>) a activé le mode Ne pas déranger automatiquement avec un comportement personnalisé."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Vous ne pouvez pas modifier ces paramètres pour le moment. Une application a activé le mode Ne pas déranger automatiquement avec un comportement personnalisé."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Vous ne pouvez pas modifier ces paramètres pour le moment. Le mode Ne pas déranger a été activé automatiquement avec un comportement personnalisé."</string>
@@ -3863,14 +3856,9 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utiliser le Bluetooth en conduisant"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activer automatiquement le Bluetooth lorsque vous conduisez"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Afficher les paramètres de batterie d\'Android 8.0"</string>
-    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
-    <skip />
-    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
-    <skip />
+    <string name="change_wifi_state_title" msgid="2640523995824431999">"Activer/Désactiver le Wi-Fi"</string>
+    <string name="keywords_change_wifi_state" msgid="1439807171750715923">"activer/désactiver le Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_title" msgid="1022360625069880993">"Activer/Désactiver le Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="724818064600933957">"Autoriser l\'activation et la désactivation du Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="2511212187129042304">"Autoriser cette application à modifier l\'état du Wi-Fi, y compris la connexion au Wi-Fi, ainsi que l\'activation et la désactivation de ce dernier"</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 72ec75e9318..55420ebabb7 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -138,12 +138,14 @@
     <item msgid="477015974247590543">"Uma hora"</item>
     <item msgid="5198271470953124739">"Nunca definir tempo limite"</item>
   </string-array>
-    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->
-    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->
+  <string-array name="bluetooth_max_connected_audio_devices">
+    <item msgid="834764606877643762">"Usar padrão do sistema: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>
+    <item msgid="4428462068012149533">"1"</item>
+    <item msgid="2620881722754455257">"2"</item>
+    <item msgid="402831176731135702">"3"</item>
+    <item msgid="4923580285404888038">"4"</item>
+    <item msgid="3643103044864989283">"5"</item>
+  </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a437cce5fb0..eea65f4b031 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1443,8 +1443,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Permissões no nível do app"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
-    <!-- no translation found for location_recent_location_requests_see_all (9063541547120162593) -->
-    <skip />
+    <string name="location_recent_location_requests_see_all" msgid="9063541547120162593">"Ver tudo"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum app solicitou a localização recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
@@ -2317,8 +2316,7 @@
     <string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Para que você possa usar o armazenamento de credenciais, seu dispositivo precisa ter uma tela de bloqueio"</string>
     <string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DEFINIR BLOQUEIO"</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso ao uso"</string>
-    <!-- no translation found for emergency_tone_title (254495218194925271) -->
-    <skip />
+    <string name="emergency_tone_title" msgid="254495218194925271">"Sinal de discagem de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
@@ -2927,12 +2925,9 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Repr. de alto-falante em dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Somente áudio de mídia"</string>
-    <!-- no translation found for emergency_tone_silent (3750231842974733677) -->
-    <skip />
-    <!-- no translation found for emergency_tone_alert (8523447641290736852) -->
-    <skip />
-    <!-- no translation found for emergency_tone_vibrate (2278872257053690683) -->
-    <skip />
+    <string name="emergency_tone_silent" msgid="3750231842974733677">"Silêncio"</string>
+    <string name="emergency_tone_alert" msgid="8523447641290736852">"Tons"</string>
+    <string name="emergency_tone_vibrate" msgid="2278872257053690683">"Vibrações"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Nunca"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="7346979080337117366">
@@ -3112,9 +3107,7 @@
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Escolher tipo de regra"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Excluir a regra \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Excluir"</string>
-    <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regra"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Desconhecido"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurar regra"</string>
     <string name="zen_mode_app_set_behavior" msgid="1534429320064381355">"Não é possível alterar essas configurações no momento. Um app (<xliff:g id="APP_NAME">%1$s</xliff:g>) ativou automaticamente o modo \"Não perturbe\" com comportamento personalizado."</string>
     <string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Não é possível alterar essas configurações no momento. Um app ativou automaticamente o modo \"Não perturbe\" com comportamento personalizado."</string>
     <string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Não é possível alterar essas configurações no momento. O modo \"Não perturbe\" foi ativado manualmente com comportamento personalizado."</string>
@@ -3863,14 +3856,9 @@
     <string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
     <string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
     <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver configurações de bateria do Android 8.0"</string>
-    <!-- no translation found for change_wifi_state_title (2640523995824431999) -->
-    <skip />
-    <!-- no translation found for keywords_change_wifi_state (1439807171750715923) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_title (1022360625069880993) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_switch (724818064600933957) -->
-    <skip />
-    <!-- no translation found for change_wifi_state_app_detail_summary (2511212187129042304) -->
-    <skip />
+    <string name="change_wifi_state_title" msgid="2640523995824431999">"Ativar e desativar o Wi-Fi"</string>
+    <string name="keywords_change_wifi_state" msgid="1439807171750715923">"ativar e desativar o Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_title" msgid="1022360625069880993">"Ativar e desativar o Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_switch" msgid="724818064600933957">"Permitir alternância do Wi-Fi"</string>
+    <string name="change_wifi_state_app_detail_summary" msgid="2511212187129042304">"Permitir que esse app altere o estado do Wi-Fi, inclusive se conectando ao Wi-Fi e ativando-o ou desativando-o."</string>
 </resources>