diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index be5c2613069..554709049ee 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2367,7 +2367,7 @@
     <string name="keywords_sounds_and_notifications" msgid="5965996187974887000">"بیپ بلندگو"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="2912933812460077912">"مزاحم نشوید قطع وقفه توقف"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
-    <string name="keywords_location" msgid="782326973714313480">"گزارش‌دهی سابقه مکان اطراف"</string>
+    <string name="keywords_location" msgid="782326973714313480">"گزارش‌دهی سابقه موقعیت مکانی اطراف"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"دقت"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"حساب"</string>
     <string name="keywords_users" msgid="4673901601478559100">"محدودیت محدود محدود شده"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2a00b729140..b7821ce7188 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -214,7 +214,7 @@
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
-    <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IMEI :"</string>
+    <string name="radio_info_imei_label" msgid="1220524224732944192">"Code IIEM :"</string>
     <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Redirection des appels :"</string>
     <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Nombre de réinitialisations PPP depuis le démarrage :"</string>
     <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"Déconnexions GSM :"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b4119a9da12..dd5fd1afba1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2420,7 +2420,7 @@
     <item quantity="one" msgid="8344183614159211585">"%d aplicação consegue ler notificações"</item>
     <item quantity="other" msgid="980049191810249052">"%d aplicações conseguem ler notificações"</item>
   </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum serviço de escuta de notificações instalado."</string>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
     <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
     <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0eb4083524b..7b5b8f346f6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/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">"Trust agents"</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">"Посмотреть или отключить Trust Agents"</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>
@@ -1869,7 +1869,7 @@
     <string name="managed_profile_device_admin_info" msgid="5048846624960067582">"Откройте \"Настройки &gt; Аккаунты\" и удалите рабочий профиль, чтобы запретить приложению <xliff:g id="APP_NAME">%1$s</xliff:g> доступ к нему"</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">"Удаленное управление Android"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Активировать"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Администратор устройства"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eef44e78225..d6b81af2efe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1493,18 +1493,18 @@
     <string name="app_name_label" msgid="5440362857006046193">"应用"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"上次使用时间"</string>
     <string name="usage_time_label" msgid="295954901452833058">"使用时间"</string>
-    <string name="accessibility_settings" msgid="3975902491934816215">"辅助功能"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"辅助功能设置"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"无障碍"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"无障碍设置"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_display_title" msgid="7610175687949675162">"显示"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手势"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"启用此功能后，您可以通过点按屏幕三次进行缩放。\n\n放大时，您可以：\n"<ul><li>"平移：在屏幕上拖动两根或更多根手指。"</li>\n<li>"调整缩放级别：开合两根或更多根手指。"</li></ul>\n\n"同时，您还可以通过点按三次并按住的方法来暂时性地放大手指触摸到的内容。在此放大状态下，您可以拖动手指查看屏幕上的各个部分。松开手指即可返回之前的状态。\n\n请注意：点按屏幕三次进行放大的方法适用于除键盘和导航栏外的所有情况。"</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"辅助功能快捷方式"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"无障碍快捷方式"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"开启"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"关闭"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"启用该功能后，您只需两步即可迅速启用辅助功能：\n\n步骤 1：持续按住电源按钮，直到您听到提示音或感觉到震动。\n\n步骤 2：用两根手指触摸屏幕并按住，直到您听到确认提示音。\n\n如果该设备有多个用户，在锁定屏幕上进行此快捷操作可暂时启用辅助功能，直到该设备解锁。"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"启用该功能后，您只需两步即可迅速启用无障碍功能：\n\n步骤 1：持续按住电源按钮，直到您听到提示音或感觉到震动。\n\n步骤 2：用两根手指触摸屏幕并按住，直到您听到确认提示音。\n\n如果该设备有多个用户，在锁定屏幕上进行此快捷操作可暂时启用无障碍功能，直到该设备解锁。"</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"大号字体"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"高对比度文字"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"屏幕放大"</string>
@@ -1562,7 +1562,7 @@
     <string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"由于您已开启辅助功能服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
+    <string name="secure_lock_encryption_warning" msgid="464101518421886337">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的 PIN 码。"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的密码。"</string>
@@ -2360,7 +2360,7 @@
     <string name="keywords_battery" msgid="2096185085932675704">"耗电量 充电"</string>
     <string name="keywords_spell_checker" msgid="6106749039734174140">"拼写 字典 词典 拼写检查 自动更正"</string>
     <string name="keywords_voice_input" msgid="3519547605812413860">"识别程序 输入 语音 说出 语言 免触摸 识别 令人反感的字词 音频记录 蓝牙耳机"</string>
-    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"语速 语言 默认 说出 语音 TTS 辅助功能 阅读器 读者 盲人"</string>
+    <string name="keywords_text_to_speech_output" msgid="392447904221657930">"语速 语言 默认 说出 语音 TTS 无障碍 阅读器 读者 盲人"</string>
     <string name="keywords_date_and_time" msgid="2631808108134830066">"时钟 军用"</string>
     <string name="keywords_factory_data_reset" msgid="4355133848707691977">"擦除 删除 恢复 清除 移除"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"打印机"</string>
@@ -2506,9 +2506,9 @@
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求输入 PIN 码吗？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"要求绘制图案吗？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"要求输入密码吗？"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"当您输入 PIN 码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="1890374082842868489">"当您输入 PIN 码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI信息"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>
     <string name="slot_number" msgid="3762676044904653577">"（插槽<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>