Snap for 10377902 from 24424bfce67e443812ec06a9f8ad58c50f7ec05d to udc-d2-release

Change-Id: I5aa6999db81869eb0c51ddea7fab4db5738f5c1c
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index 0488380..72fad27 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -921,7 +921,7 @@
     <string name="device_apps_app_management_force_stop" msgid="4454221309989640309">"فرض الإيقاف"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="1980972142863114899">"قد لا يعمل التطبيق بشكل صحيح في حال فرض إيقافه."</string>
     <string name="device_apps_app_management_uninstall" msgid="4171103696233332967">"إزالة"</string>
-    <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"إزالة التحديثات"</string>
+    <string name="device_apps_app_management_uninstall_updates" msgid="5647988075828648951">"إلغاء تثبيت التحديثات"</string>
     <string name="device_apps_app_management_uninstall_updates_desc" msgid="4508586498292236706">"ستتم إزالة جميع تحديثات تطبيق نظام Android هذا."</string>
     <string name="device_apps_app_management_disable" msgid="819003297535493633">"إيقاف"</string>
     <string name="device_apps_app_management_disable_desc" msgid="9143166267511427607">"هل تريد إيقاف هذا التطبيق؟"</string>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index 44ce36b..62247de 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -65,13 +65,13 @@
     <string name="privacy_app_settings_category" msgid="858250971978879266">"Nastavení aplikací"</string>
     <string name="privacy_category_summary" msgid="3534434883380511043">"Poloha, využití a diagnostika, reklamy"</string>
     <string name="add_account" msgid="7386223854837017129">"Přidat účet"</string>
-    <string name="account_header_remove_account" msgid="8573697553061331373">"Odebrat účet"</string>
+    <string name="account_header_remove_account" msgid="8573697553061331373">"Odstranit účet"</string>
     <string name="account_sync" msgid="4315295293211313989">"Vyberte aplikace k synchronizaci"</string>
     <string name="sync_now" msgid="4335217984374620551">"Synchronizovat"</string>
     <string name="sync_in_progress" msgid="8081367667406185785">"Synchronizace…"</string>
     <string name="last_synced" msgid="8371967816955123864">"Poslední synchronizace: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="sync_disabled" msgid="6652778349371079140">"Vypnuto"</string>
-    <string name="account_remove" msgid="8456848988853890155">"Odebrat účet"</string>
+    <string name="account_remove" msgid="8456848988853890155">"Odstranit účet"</string>
     <string name="account_remove_failed" msgid="5654411101098531690">"Účet nelze odebrat"</string>
     <!-- no translation found for sync_item_title (5884138264243772176) -->
     <skip />
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index c5df2eb..15ee9b9 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -227,7 +227,7 @@
     <string name="device_storage_clear_cache_message" msgid="4352802738505831032">"اطلاعات در حافظه پنهان همه برنامه‌ها پاک می‌شود."</string>
     <string name="default_audio_output_settings_title" msgid="5441937324539531999"></string>
     <string name="accessories_add" msgid="413764175035531452">"افزودن وسیله جانبی"</string>
-    <string name="accessory_state_pairing" msgid="15908899628218319">"در حال مرتبط‌سازی..."</string>
+    <string name="accessory_state_pairing" msgid="15908899628218319">"درحال جفت کردن..."</string>
     <string name="accessory_state_connecting" msgid="6560241025917621212">"در حال اتصال..."</string>
     <string name="accessory_state_error" msgid="8353621828816824428">"مرتبط‌سازی انجام نشد"</string>
     <string name="accessory_state_canceled" msgid="4794837663402063770">"لغو شد"</string>
@@ -235,7 +235,7 @@
     <string name="accessory_options" msgid="774592782382321681">"وسیله جانبی"</string>
     <string name="accessory_unpair" msgid="2473411128146068804">"لغو مرتبط‌سازی"</string>
     <string name="accessory_battery" msgid="2283700366184703548">"باتری ٪٪<xliff:g id="PERCENTAGE">%1$d</xliff:g>"</string>
-    <string name="accessory_unpairing" msgid="2529195578082286563">"‫در حال لغو مرتبط‌سازی دستگاه..."</string>
+    <string name="accessory_unpairing" msgid="2529195578082286563">"‫در حال لغو جفت کردن دستگاه..."</string>
     <string name="accessory_connected" msgid="5229574480869175180">"متصل"</string>
     <string name="accessory_change_name" msgid="6493717176878500683">"تغییر نام"</string>
     <string name="accessory_change_name_title" msgid="451188562035392238">"نام جدیدی برای این وسیله جانبی وارد کنید"</string>
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index 26e1b1c..3e54189 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -1118,7 +1118,7 @@
     <string name="power_on_behavior" msgid="927607372303160716">"开机行为"</string>
     <string name="reset_options_title" msgid="7632580482285108955">"重置"</string>
     <string name="adb_pairing_device_dialog_ethernet_pairing_code_label" msgid="7551782499828944838">"以太网配对码"</string>
-    <string name="energy_modes" msgid="1331693860386361744">"耗能模式"</string>
+    <string name="energy_modes" msgid="1331693860386361744">"能耗模式"</string>
     <string name="energy_modes_summary" msgid="7196407759836930799">"在您未使用电视时改善能效"</string>
     <string name="energy_mode_enables" msgid="357960364751477627">"启用:"</string>
     <string name="energy_mode_eco_hint" msgid="1461517905015359947">"请注意,此模式可能会增加设备的耗电量。"</string>