diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1db9257..d5116d2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -148,7 +148,7 @@
     <string name="bluetooth_pref_summary" product="device" msgid="2192027516577675587">"به دستگاهتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_pref_summary" product="default" msgid="768958961865499804">"به تلفنتان اجازه دهید با دستگاه‌های بلوتوث اطراف مرتبط شود"</string>
     <string name="bluetooth_disable_a2dp_hw_offload" msgid="5942913792817797541">"‏غیرفعال کردن انتقال داده ازطریق سخت‌افزار بلوتوث A2DP"</string>
-    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"غیرفعال کردن تخلیه سخت‌افزار «صدای کم‌مصرف بلوتوث»"</string>
+    <string name="bluetooth_disable_le_audio_hw_offload" msgid="3966022676505972908">"‏غیرفعال کردن تخلیه سخت‌افزار بلوتوث LE AUDIO"</string>
     <string name="bluetooth_disable_hw_offload_dialog_title" msgid="6001142380445276918">"دستگاه بازراه‌اندازی شود؟"</string>
     <string name="bluetooth_disable_hw_offload_dialog_message" msgid="1524373895333698779">"برای تغییر این تنظیم، باید دستگاه را بازراه‌اندازی کنید."</string>
     <string name="bluetooth_disable_hw_offload_dialog_confirm" msgid="5594859658551707592">"بازراه‌اندازی"</string>
@@ -731,7 +731,7 @@
     <string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"<xliff:g id="APP_NAME">%1$s</xliff:g> توصیه می‌کند از پین یا گذرواژه‌ای قوی استفاده کنید و ممکن است درصورت عدم ارائه یکی از این موارد کار نکند"</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"<xliff:g id="APP_NAME">%1$s</xliff:g> توصیه می‌کند از پین یا گذرواژه جدیدی استفاده کنید و ممکن است درصورت عدم ارائه یکی از این موارد کار نکند"</string>
     <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> توصیه می‌کند از الگو، پین یا گذرواژه جدیدی استفاده کنید و ممکن است درصورت عدم ارائه یکی از این موارد کار نکند"</string>
-    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"‫<xliff:g id="APP_NAME">%1$s</xliff:g> توصیه می‌کند از قفل صفحه جدیدی استفاده کنید"</string>
+    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g> توصیه می‌کند از قفل صفحه جدیدی استفاده کنید"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"دوباره امتحان کنید. تلاش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"داده‌هایتان حذف خواهد شد"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dfe28eb..ff15565 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -733,7 +733,7 @@
     <string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 안전한 PIN 또는 비밀번호를 사용할 것을 제안합니다. 제안을 무시하면 앱이 제대로 작동하지 않을 수 있습니다."</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 새 PIN 또는 비밀번호를 사용할 것을 제안합니다. 제안을 무시하면 앱이 제대로 작동하지 않을 수 있습니다."</string>
     <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 새 패턴, PIN 또는 비밀번호를 사용할 것을 제안합니다. 제안을 무시하면 앱이 제대로 작동하지 않을 수 있습니다."</string>
-    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 새 화면 잠금을 사용할 것을 제안합니다."</string>
+    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 새 잠금 화면을 사용할 것을 제안합니다."</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"다시 시도하세요. 입력 횟수: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>회"</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"데이터 삭제 위험"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"다음번 시도에서 잘못된 패턴을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index c5ae28c..1260e15 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1034,7 +1034,7 @@
     <string name="wifi_password" msgid="1458802324849513755">"പാസ്‌വേഡ്"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"പാസ്‌വേഡ് കാണിക്കുക"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP ബാൻഡ് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"സ്വയമേവ"</string>
+    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"സ്വമേധയാ"</string>
     <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 GHz ബാൻഡ്"</string>
     <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 GHz ബാൻഡ്"</string>
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 GHz ബാൻഡിന് മുൻഗണന"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index a5b6be7..90d9b20 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3613,7 +3613,7 @@
     <string name="keywords_battery_saver" msgid="6289682844453234359">"ဘက်ထရီ အားထိန်း၊ ပါဝါချွေတာစနစ်၊ ချွေတာစနစ်"</string>
     <string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"အလိုက်သင့် သတ်မှတ်ချက်များ၊ အလိုက်အထိုက် ဘက်ထရီအားထိန်း"</string>
     <string name="keywords_spell_checker" msgid="5148906820603481657">"စာလုံးပေါင်းခြင်း၊ အဘိဓာန်၊ သတ်ပုံစစ်ဆေးခြင်း၊ အလိုအလျောက် အမှားပြင်ဆင်ခြင်း"</string>
-    <string name="keywords_voice_input" msgid="7534900094659358971">"အသိမှတ်ပြုကိရိယာ၊ အဝင်၊ စကားပြောဆိုမှု၊ စကားပြော၊ ဘာသာစကား၊ လက်အလွှတ်၊ လက်အလွှတ်၊ အသိမှတ်ပြုခြင်း၊ စိတ်အနှောင့်အယှက်ဖြစ်စေသော၊ စကားလုံး၊ အသံ၊ မှတ်တမ်း၊ ဘလူးတုသ်နားကြပ်"</string>
+    <string name="keywords_voice_input" msgid="7534900094659358971">"အသိမှတ်ပြုကိရိယာ၊ အဝင်၊ စကားပြောဆိုမှု၊ စကားပြော၊ ဘာသာစကား၊ လက်အလွှတ်၊ လက်အလွှတ်၊ အသိမှတ်ပြုခြင်း၊ စိတ်အနှောင့်အယှက်ဖြစ်စေသော၊ စကားလုံး၊ အသံ၊ သမိုင်း၊ ဘလူးတုသ်နားကြပ်"</string>
     <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"နှုန်း၊ ဘာသာစကား၊ မူရင်း၊ စကားပြော၊ စကားပြောခြင်း၊ tts၊ အသုံးပြုနိုင်စွမ်း၊ မျက်နှာပြင် စာဖတ်မှု၊ မျက်မမြင်"</string>
     <string name="keywords_date_and_time" msgid="4402136313104901312">"နာရီ၊ စစ်တပ်"</string>
     <string name="keywords_network_reset" msgid="4075670452112218042">"ပြန်လည်သတ်မှတ်ရန်၊ ပြန်လည်သိုလှောင်ရန်၊ စက်ရုံ"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index aa2c498..05c6e2c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -4861,7 +4861,7 @@
     <string name="special_access_more" msgid="132919514147475846">"Ver mais"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Informações na tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"Todas as opções"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Dicas e suporte"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index aa2c498..05c6e2c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -4861,7 +4861,7 @@
     <string name="special_access_more" msgid="132919514147475846">"Ver mais"</string>
     <string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="6309263655965785411">"Informações na tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="6309263655965785411">"Controlar informações na tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="7188875610123234454">"Todas as opções"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"Dicas e suporte"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 0114b11..3560938 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -731,7 +731,7 @@
     <string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> مضبوط PIN یا پاس ورڈ کی تجویز کرتی ہے اور ہو سکتا ہے کہ ان میں سے کسی ایک کے بغیر توقع کے مطابق کام نہ کرے"</string>
     <string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> نئے PIN یا پاس ورڈ کی تجویز کرتی ہے اور ہو سکتا ہے کہ ان میں سے کسی ایک کے بغیر توقع کے مطابق کام نہ کرے"</string>
     <string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"‏<xliff:g id="APP_NAME">%1$s</xliff:g> ایک نئے پیٹرن، PIN یا پاس ورڈ کی تجویز کرتی ہے اور ہو سکتا ہے کہ ان میں سے کسی ایک کے بغیر توقع کے مطابق کام نہ کرے"</string>
-    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"‫<xliff:g id="APP_NAME">%1$s</xliff:g> نئے اسکرین لاک کی تجویز کرتی ہے"</string>
+    <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"<xliff:g id="APP_NAME">%1$s</xliff:g> نئے اسکرین لاک کی تجویز کرتی ہے"</string>
     <string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"دوبارہ کوشش کریں۔ کوشش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>۔"</string>
     <string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"آپ کا ڈیٹا حذف کر دیا جائے گا"</string>
     <string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو اس آلے کا ڈیٹا حذف کر دیا جائے گا"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index acc282d..222c949 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -5092,7 +5092,7 @@
     <string name="financed_privacy_notifications" msgid="5932303271274089968">"Xem thông báo và tin nhắn văn bản"</string>
     <string name="financed_privacy_allowlisted_apps" msgid="8333040812194879963">"Truy cập các ứng dụng được tổ chức tín dụng cho phép"</string>
     <string name="financed_privacy_fully_paid_category" msgid="9221763928564246923">"Sau khi bạn trả toàn bộ phí:"</string>
-    <string name="financed_privacy_restrictions_removed" msgid="3182636815294595072">"Tất cả các hạn chế đều được dỡ bỏ khỏi thiết bị"</string>
+    <string name="financed_privacy_restrictions_removed" msgid="3182636815294595072">"Tất cả các hạn chế đều bị xoá khỏi thiết bị"</string>
     <string name="financed_privacy_uninstall_creditor_app" msgid="6339004120497310705">"Bạn có thể gỡ cài đặt ứng dụng của tổ chức tín dụng"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="other">Ứng dụng Máy ảnh</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 96471c5..624fa17 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3995,7 +3995,7 @@
     <string name="notification_channel_summary_default" msgid="3674057458265438896">"可能会响铃或振动（取决于手机设置）"</string>
     <string name="notification_channel_summary_high" msgid="3411637309360617621">"当设备处于解锁状态时，在屏幕顶端以横幅形式显示通知"</string>
     <string name="notification_switch_label" msgid="8029371325967501557">"所有“<xliff:g id="APP_NAME">%1$s</xliff:g>”通知"</string>
-    <string name="notification_app_switch_label" msgid="4422902423925084193">"所有<xliff:g id="APP_NAME">%1$s</xliff:g>通知"</string>
+    <string name="notification_app_switch_label" msgid="4422902423925084193">"<xliff:g id="APP_NAME">%1$s</xliff:g>的所有通知"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"自适应通知功能"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="other">每天大约 <xliff:g id="NUMBER_1">%,d</xliff:g> 条通知</item>
diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
index bd45226..3e9875e 100644
--- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -72,7 +72,9 @@
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, this)
                 .setNegativeButton(android.R.string.no, this);
-        return builder.create();
+        AlertDialog dialog = builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
 
     @Override