diff --git a/Android.bp b/Android.bp
index bb9db22..610e7e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@
         "androidx.lifecycle_lifecycle-extensions",
         "guava",
         "jsr305",
+        "net-utils-framework-common",
         "settings-contextual-card-protos-lite",
         "settings-log-bridge-protos-lite",
         "contextualcards",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de85af3..f06d38f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.QUERY_AUDIO_STATE" />
     <uses-permission android:name="android.permission.MASTER_CLEAR" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
@@ -141,7 +142,8 @@
         <activity android:name=".network.telephony.MobileNetworkActivity"
                   android:label="@string/network_settings_title"
                   android:exported="true"
-                  android:launchMode="singleTask">
+                  android:launchMode="singleTask"
+                  android:configChanges="orientation|screenSize|keyboardHidden">
             <intent-filter android:priority="1">
                 <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
                 <action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
@@ -279,6 +281,17 @@
                 android:value="true" />
         </activity>
 
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias
+            android:name="Settings$WifiSettings2Activity"
+            android:targetActivity="Settings$WifiSettingsActivity"
+            android:label="@string/wifi_settings"
+            android:icon="@drawable/ic_homepage_network"
+            android:exported="true">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.wifi.WifiSettings" />
+        </activity-alias>
+
         <activity
             android:name="Settings$NetworkProviderSettingsActivity"
             android:label="@string/provider_internet_settings"
@@ -330,6 +343,17 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".Settings$AdaptiveBrightnessActivity"
+            android:label="@string/auto_brightness_title"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.display.AutoBrightnessSettings"/>
+        </activity>
+
         <activity
             android:name="Settings$ConfigureWifiSettingsActivity"
             android:label="@string/wifi_configure_settings_preference_title"
@@ -2304,6 +2328,7 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
+                <action android:name="android.bluetooth.action.CSIS_SET_MEMBER_AVAILABLE"/>
             </intent-filter>
         </receiver>
 
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 4891275..28ad1f6 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -65,6 +65,18 @@
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
             android:visibility="gone" />
 
+        <TextView
+            android:id="@+id/pairing_group_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/bluetooth_dialog_padding"
+            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
+            android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
+            android:gravity="center_vertical"
+            android:text="@string/bluetooth_paring_group_msg"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
+            android:visibility="gone" />
+
         <CheckBox
             android:id="@+id/phonebook_sharing_message_confirm_pin"
             android:layout_width="wrap_content"
diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
index 27d12a8..c169e58 100644
--- a/res/layout/dialog_sim_status.xml
+++ b/res/layout/dialog_sim_status.xml
@@ -166,6 +166,7 @@
             android:id="@+id/esim_id_value"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textIsSelectable="true"
             android:text="@string/device_info_not_available"/>
 
         <TextView
diff --git a/res/layout/wifi_calling_settings_preferences.xml b/res/layout/wifi_calling_settings_preferences.xml
index 98acd95..9a6cbe6 100644
--- a/res/layout/wifi_calling_settings_preferences.xml
+++ b/res/layout/wifi_calling_settings_preferences.xml
@@ -29,16 +29,11 @@
 
     <FrameLayout
         android:id="@android:id/tabcontent"
-        android:layout_width="0dip"
-        android:layout_height="0dip" />
-
-    <FrameLayout
-        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:clipChildren="false"
-        android:clipToPadding="false"
+        android:clipChildren="true"
+        android:clipToPadding="true"
         android:smoothScrollbar="false" />
 
 </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 73096d7..9c96c9f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Jy sal hierdie PIN dalk op die ander toestel ook moet invoer."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Jy sal hierdie sleutel dalk op die ander toestel ook moet invoer."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Om saam te bind met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;maak seker dit wys hierdie geheimsleutel:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bevestig om met die gekoördineerde stel saam te bind"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Om saam te bind met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer daarop in:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, druk dan Return of Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Laat toegang tot jou kontakte en oproepgeskiedenis toe"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kon nie koppel nie. Probeer weer."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Toestelbesonderhede"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Toestel se Bluetooth-adres: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Toestel se Bluetooth-adres:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vergeet toestel?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Verwyder assosiasie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ontkoppel program?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Onthou instellings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maks. gekoppelde Bluetooth-oudiotoestelle"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Kies maksimum aantal gekoppelde Bluetooth-oudiotoestelle"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-stapelontfoutingloglêer"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Verhoog NFC-stapelloglêervlak"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Saai uit"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"weerspieël"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktiveer draadlose skermdeling"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Laaiproses word tydelik beperk"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Om jou battery te spaar. Kom meer te wete."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Hervat laaiproses"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"In sekere omstandighede, soos hoë temperature en lang laaitydperke, kan die laaiproses tot <xliff:g id="PERCENT">%1$s</xliff:g> beperk word om te help om batterygesondheid in stand te hou.\n\nWanneer dié omstandighede eindig, sal jou foon outomaties normaalweg laai."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"In sekere omstandighede, soos hoë temperature en lang laaitydperke, kan die laaiproses tot <xliff:g id="PERCENT">%1$s</xliff:g> beperk word om te help om batterygesondheid in stand te hou.\n\nWanneer daardie omstandighede eindig, sal jou tablet outomaties normaalweg laai."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"In sekere omstandighede, soos hoë temperature en lang laaitydperke, kan die laaiproses tot <xliff:g id="PERCENT">%1$s</xliff:g> beperk word om die battery gesond te hou.\n\nWanneer dié omstandighede eindig, sal jou foon outomaties normaalweg laai."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"In sekere omstandighede, soos hoë temperature en lang laaitydperke, kan die laaiproses tot <xliff:g id="PERCENT">%1$s</xliff:g> beperk word om die battery gesond te hou.\n\nWanneer daardie omstandighede eindig, sal jou tablet outomaties normaalweg laai."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Jy het jou foon meer as gewoonlik gebruik en daarom sal jou battery dalk gouer as normaalweg pap word.\n\nProgramme wat die meeste batterykrag gebruik:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Jy het jou tablet meer as gewoonlik gebruik en daarom sal jou battery dalk gouer as normaalweg pap word.\n\nProgramme wat die meeste batterykrag gebruik:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Jy het jou toestel meer as gewoonlik gebruik en daarom sal jou battery dalk gouer as normaalweg pap word.\n\nProgramme wat die meeste batterykrag gebruik:"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index aaac29e..6e9ed30 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ይህን ፒን  በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ይህን የይለፍ ቁልፍ በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ጋር ለማገናኘት ይህን የይለፍ ቁልፍ ማሳየቱን አረጋግጥ፡&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ከተባባሪ ስብስቡ ጋር ለመጣመር ያረጋግጡ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ከ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር ላዩ ላይ ተይብበት:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ከዚያም ተመለስ ወይም አስገባ ተጫን::"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"የእርስዎን የእውቂያዎች እና የጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ማገናኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
     <string name="device_details_title" msgid="1155622417516195481">"የመሣሪያ ዝርዝሮች"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"የመሣሪያ የብሉቱዝ አድራሻ፦ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"የመሣሪያ የብሉቱዝ አድራሻ፦\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"መሣሪያ ይረሳ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ጉድኝትን አስወግድ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"የመተግበሪያ ግንኙነት ይቋረጥ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ቅንብሮች አስታውስ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛት"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ከፍተኛው የተገናኙ የብሉቱዝ ኦዲዮ መሣሪያዎች ብዛትን ይምረጡ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"የኤንኤፍሲ ቁልል የስህተት አርም ምዝግብ ማስታወሻ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"የኤንኤፍሲ ቁልል የምዝግብ ማስታወሻ ደረጃን ይጨምሩ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"መስታወት"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ገመድ-አልባ ማሳየትን ያንቁ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 47d6130..5f16598 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -655,7 +655,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="4746783679112447948">"تغيير قفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"‏تغيير أو إيقاف النقش أو رمز PIN أو أمان كلمة المرور"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="1699993191343299179">"اختيار طريقة لقفل الشاشة"</string>
-    <string name="unlock_set_unlock_off_title" msgid="2831957685685921667">"بدون"</string>
+    <string name="unlock_set_unlock_off_title" msgid="2831957685685921667">"بدون قفل"</string>
     <string name="unlock_set_unlock_off_summary" msgid="4578319976164001322"></string>
     <string name="unlock_set_unlock_none_title" msgid="2844029875174409728">"التمرير السريع"</string>
     <string name="unlock_set_unlock_none_summary" msgid="641298008390890152">"بدون تأمين"</string>
@@ -893,6 +893,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‏قد يلزم أيضًا كتابة رمز PIN هذا على الجهاز الآخر."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"قد يلزم أيضًا كتابة مفتاح المرور هذا على الجهاز الآخر."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏للاقتران مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;تأكد من أنه يعرض مفتاح المرور هذا:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"تأكيد الاقتران بمجموعة الأجهزة المنظمة"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;الاقتران مع هذا الجهاز؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏للإقران مع:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب عليه:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ثم اضغط على Return أو Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string>
@@ -926,6 +927,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"تعذر الاتصال. يُرجى إعادة المحاولة."</string>
     <string name="device_details_title" msgid="1155622417516195481">"تفاصيل الجهاز"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"عنوان البلوتوث للجهاز: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"عنوان البلوتوث للجهاز:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"هل تريد إلغاء إقران الجهاز؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"إزالة الربط"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"هل تريد إلغاء ربط التطبيق؟"</string>
@@ -958,7 +960,9 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"تذكّر الإعدادات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"اختيار الحد الأقصى لعدد الأجهزة الصوتية المتّصلة باستخدام البلوتوث"</string>
-    <string name="wifi_display_settings_title" msgid="6451625615274960175">"الإرسال"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏سجلّ تصحيح أخطاء حزمة الاتصال القصير المدى (NFC)"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏زيادة مستوى التسجيل لحزمة الاتصال القصير المدى (NFC)"</string>
+    <string name="wifi_display_settings_title" msgid="6451625615274960175">"البث"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"انعكاس"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"تفعيل عرض شاشة لاسلكي"</string>
     <string name="wifi_display_no_devices_found" msgid="7904877793677102805">"لم يتم العثور على أجهزة قريبة."</string>
@@ -1379,7 +1383,7 @@
     <string name="search_settings" msgid="7573686516434589771">"بحث"</string>
     <string name="display_settings" msgid="7197750639709493852">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"التدوير التلقائي للشاشة"</string>
-    <string name="auto_rotate_option_off" msgid="2788096269396290731">"متوقف"</string>
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"غير مفعّل"</string>
     <string name="auto_rotate_option_on" msgid="5776678230808498171">"مفعّل"</string>
     <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"تفعيل - استنادًا للوجه"</string>
     <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"تفعيل ميزة \"التعرف على الوجوه\""</string>
@@ -1495,7 +1499,7 @@
     <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"اختيار خلفية من"</string>
     <string name="style_suggestion_title" msgid="1213747484782364775">"تخصيص الهاتف"</string>
     <string name="style_suggestion_summary" msgid="4271131877800968159">"يمكنك تجربة أنماط وخلفيات مختلفة، والمزيد."</string>
-    <string name="screensaver_settings_title" msgid="3588535639672365395">"شاشة التوقف"</string>
+    <string name="screensaver_settings_title" msgid="3588535639672365395">"شاشة الاستراحة"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"أثناء الشحن أو الإرساء"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2126139984738506920">"أيهما"</string>
     <string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"أثناء الشحن"</string>
@@ -1504,7 +1508,7 @@
     <string name="screensaver_settings_summary_off" msgid="8720357504939106923">"إيقاف"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1166343194760238835">"للتحكم في ما يحدث عند إرساء الهاتف و/أو دخوله حالة السكون، عليك تشغيل شاشة التوقف."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8145025742428940520">"وقت البدء"</string>
-    <string name="screensaver_settings_current" msgid="390472865895976891">"شاشة التوقف الحالية"</string>
+    <string name="screensaver_settings_current" msgid="390472865895976891">"شاشة الاستراحة الحالية"</string>
     <string name="screensaver_settings_button" msgid="6159236558934930238">"إعدادات"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"الرفع لتنبيه الجهاز"</string>
@@ -2108,11 +2112,11 @@
     <string name="install_applications_title" msgid="7890233747559108106">"السماح بكل مصادر التطبيقات"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"التطبيقات التي تم فتحها مؤخرًا"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
-      <item quantity="zero">‏عرض كل الـ %1$d تطبيق</item>
+      <item quantity="zero">‏عرض كل التطبيقات البالغ عددها %1$d </item>
       <item quantity="two">‏عرض كلا التطبيقين (%1$d)</item>
-      <item quantity="few">‏عرض كل الـ %1$d تطبيقات</item>
-      <item quantity="many">‏عرض كل الـ %1$d تطبيقًا</item>
-      <item quantity="other">‏عرض كل الـ %1$d تطبيق</item>
+      <item quantity="few">‏عرض كل التطبيقات البالغ عددها %1$d</item>
+      <item quantity="many">‏عرض كل التطبيقات البالغ عددها %1$d</item>
+      <item quantity="other">‏عرض كل التطبيقات البالغ عددها %1$d</item>
       <item quantity="one">عرض كل التطبيقات</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"تواصَل مع مشرف تكنولوجيا معلومات."</string>
@@ -2297,7 +2301,7 @@
     <string name="available_virtual_keyboard_category" msgid="6930012948152749337">"لوحة المفاتيح على الشاشة متاحة"</string>
     <string name="add_virtual_keyboard" msgid="2515850206289352606">"إدارة لوحات المفاتيح على الشاشة"</string>
     <string name="keyboard_assistance_category" msgid="7320599809770932032">"مساعدة لوحة المفاتيح"</string>
-    <string name="physical_keyboard_title" msgid="3328134097512350958">"لوحة المفاتيح الفعلية"</string>
+    <string name="physical_keyboard_title" msgid="3328134097512350958">"لوحة المفاتيح الخارجية"</string>
     <string name="show_ime" msgid="4334255501724746849">"استخدام لوحة المفاتيح على الشاشة"</string>
     <string name="show_ime_summary" msgid="7293345791727205975">"استمرار عرضها على الشاشة أثناء نشاط لوحة المفاتيح الفعلية"</string>
     <string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"اختصارات لوحة المفاتيح"</string>
@@ -2350,7 +2354,7 @@
     <string name="input_methods_settings_label_format" msgid="5809693308957109022">"إعدادات <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"اختيار أساليب الإدخال النشطة"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"إعدادات لوحة المفاتيح على الشاشة"</string>
-    <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"لوحة مفاتيح فعلية"</string>
+    <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"لوحة مفاتيح خارجية"</string>
     <string name="builtin_keyboard_settings_summary" msgid="4332792334499933856">"إعدادات لوحة المفاتيح الفعلية"</string>
     <string name="gadget_picker_title" msgid="7615902510050731400">"اختيار أداة"</string>
     <string name="widget_picker_title" msgid="7641298325488989676">"اختيار أداة"</string>
@@ -2386,7 +2390,7 @@
     <string name="talkback_summary" msgid="5820927220378864281">"إن تطبيق قارئ الشاشة مُصمَّم في الأساس من أجل الأشخاص الكفيفين والذين يعانون من ضعف في النظر."</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للشرح"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"تكبير حجم الشاشة"</string>
+    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"التكبير"</string>
     <string name="accessibility_magnification_mode_title" msgid="8446475127807168063">"نوع التكبير"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"تكبير الشاشة كلها أو جزء معيّن منها أو التبديل بين الخيارين"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ملء الشاشة"</string>
@@ -2410,7 +2414,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"التكبير على الشاشة"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"انقر ٣ مرات للتكبير."</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"انقر على أحد الأزرار للتكبير"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"‏يمكنك تكبير الشاشة بسرعة لتكبير المحتوى.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;لتكبير الشاشة، نفِّذ الخطوات التالية:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. استخدِم الاختصار المخصّص لبدء تكبير المحتوى&lt;br/&gt; {1,number,integer}. انقر على الشاشة&lt;br/&gt; {2,number,integer}. اسحب إصبعين للتنقّل على الشاشة&lt;br/&gt; {3,number,integer}. باعِد أو قارِب بإصبعين لتعديل مستوى التكبير/التصغير&lt;br/&gt; {4,number,integer}. استخدِم الاختصار المخصّص لإيقاف تكبير المحتوى&lt;br/&gt;&lt;br/&gt;&lt;b&gt;لتكبير المحتوى مؤقتًا، نفِّذ الخطوات التالية:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. استخدِم الاختصار المخصّص لبدء تكبير المحتوى&lt;br/&gt; {1,number,integer}. انقر مع الاستمرار على أي مكان على الشاشة&lt;br/&gt; {2,number,integer}. اسحب إصبعك للتنقّل على الشاشة&lt;br/&gt; {3,number,integer}. ارفع إصبعك لإيقاف تكبير الشاشة."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"‏يمكنك تكبير الشاشة بسرعة لتكبير المحتوى.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;لتكبير الشاشة، نفِّذ الخطوات التالية:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. استخدِم الاختصار لبدء تكبير المحتوى&lt;br/&gt; {1,number,integer}. انقر على الشاشة&lt;br/&gt; {2,number,integer}. اسحب إصبعين للتنقّل على الشاشة&lt;br/&gt; {3,number,integer}. باعِد أو قارِب بإصبعين لتعديل مستوى التكبير/التصغير&lt;br/&gt; {4,number,integer}. استخدِم الاختصار لإيقاف تكبير المحتوى&lt;br/&gt;&lt;br/&gt;&lt;b&gt;لتكبير المحتوى مؤقتًا، نفِّذ الخطوات التالية:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. استخدِم الاختصار لبدء تكبير المحتوى&lt;br/&gt; {1,number,integer}. انقر مع الاستمرار على أي مكان على الشاشة&lt;br/&gt; {2,number,integer}. اسحب إصبعك للتنقّل على الشاشة&lt;br/&gt; {3,number,integer}. ارفع إصبعك لإيقاف تكبير الشاشة."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"عند تفعيل ميزة \"التكبير\"، يمكنك تكبير حجم المحتوى على الشاشة.\n\n"<b>"للتكبير"</b>"، يمكنك تفعيل ميزة \"التكبير\" والنقر بعد ذلك على أي مكان في الشاشة.\n"<ul><li>"يمكنك سحب إصبعين أو أكثر للتمرير."</li>\n<li>"يمكنك ضمّ إصبعين أو أكثر لتعديل حجم المحتوى."</li></ul>\n\n<b>"للتكبير مؤقتًا"</b>"، يمكنك تفعيل ميزة التكبير والنقر مع الاستمرار على أي مكان في الشاشة.\n"<ul><li>"يمكنك السحب للتنقّل داخل الشاشة."</li>\n<li>"يمكنك رفع إصبعك للتصغير."</li></ul>\n\n"لن يكون بإمكانك التكبير على لوحة المفاتيح أو شريط التنقل."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"الصفحة <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> من <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"استخدام زر أدوات تسهيل الاستخدام في الفتح"</string>
@@ -2485,7 +2489,7 @@
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"دقيقتان"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"وقت اتخاذ إجراء (مهلة تسهيل الاستخدام)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"وقت اتخاذ الإجراء"</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"اختَر مدة عرض الرسائل التي تطلب منك اتخاذ إجراء، ولكن يقتصر عرضها على فترة مؤقتة.\n\nلا تتوافق بعض التطبيقات مع هذا الإعداد."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"حدّد مدة عرض الرسائل التي تطلب منك اتخاذ إجراء، على أن يتم عرضها بشكل مؤقت.\n\nهذا الإعداد غير متاح في كل التطبيقات."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"مهلة النقر مع الاستمرار"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"قلب الألوان"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"استخدام قلب الألوان"</string>
@@ -2794,8 +2798,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"الشحن محدود مؤقتًا"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"للحفاظ على عمر البطارية. مزيد من المعلومات"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"استئناف الشحن"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"في ظروف معيّنة، مثلاً درجات الحرارة المرتفعة وفترات الشحن الطويلة، قد يتم تحديد نسبة الشحن لتصبح <xliff:g id="PERCENT">%1$s</xliff:g> للمساعدة في الحفاظ على سلامة البطارية.\n\nعندما تنتهي تلك الظروف، سيتم تلقائيًا شحن الهاتف بشكلٍ عادي."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"في ظروف معيّنة، مثلاً درجات الحرارة المرتفعة وفترات الشحن الطويلة، قد يتم تحديد نسبة الشحن لتصبح <xliff:g id="PERCENT">%1$s</xliff:g> للمساعدة في الحفاظ على سلامة البطارية.\n\nعندما تنتهي تلك الظروف، سيتم تلقائيًا شحن الهاتف بشكلٍ عادي."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"قد يتم ضبط نسبة الشحن على <xliff:g id="PERCENT">%1$s</xliff:g> كحد أقصى للمساعدة في الحفاظ على سلامة البطارية في حالات معيّنة، مثلاً في درجات الحرارة المرتفعة وفترات الشحن الطويلة.\n\nعند العودة إلى الحالة الطبيعية، سيتم تلقائيًا شحن الهاتف بشكلٍ عادي."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"قد يتم ضبط نسبة الشحن على <xliff:g id="PERCENT">%1$s</xliff:g> كحد أقصى للمساعدة في الحفاظ على سلامة البطارية في حالات معيّنة، مثلاً في درجات الحرارة المرتفعة وفترات الشحن الطويلة.\n\nعند العودة إلى الحالة الطبيعية، سيتم تلقائيًا شحن الهاتف بشكلٍ عادي."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"بسبب استخدام هاتفك بمعدل أكثر من الطبيعي، قد ينفد شحن بطاريتك أسرع من المعتاد.\n\nالتطبيقات التي تستخدم أكبر قدر من البطارية:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"بسبب استخدام جهازك اللوحي أكثر من الطبيعي، قد ينفد شحن بطاريتك أسرع من المعتاد.\n\nالتطبيقات التي تستخدم أكبر قدر من البطارية:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"بسبب استخدام جهازك أكثر من الطبيعي، قد ينفد شحن بطاريتك أسرع من المعتاد.\n\nالتطبيقات التي تستخدم أكبر قدر من البطارية:"</string>
@@ -3100,9 +3104,9 @@
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> غير آمنة"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"الاتصال التكيفي"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"إطالة عمر البطارية وتحسين أداء الجهاز عن طريق الإدارة التلقائية للاتصالات بالشبكات"</string>
-    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"تفعيل"</string>
+    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"مفعّل"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"إيقاف"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"تخزين بيانات الاعتماد"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"وحدة تخزين بيانات الاعتماد"</string>
     <string name="credentials_install" msgid="3933218407598415827">"تثبيت شهادة"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"تثبيت الشهادات من وحدة تخزين"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"‏تثبيت الشهادات من بطاقة SD"</string>
@@ -3931,7 +3935,7 @@
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"الأصوات والاهتزازات الأخرى"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"الإشعارات"</string>
     <string name="notification_dashboard_summary" msgid="7530169251902320652">"سجلّ الإشعارات والمحادثات"</string>
-    <string name="conversation_notifs_category" msgid="2549844862379963273">"إشعارات المحادثة"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"المحادثة"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"الإشعارات التي تم إرسالها مؤخرًا"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"عرض كل التطبيقات من آخر ٧ أيام"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"إدارة"</string>
@@ -4103,7 +4107,7 @@
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"أبدًا"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"إشعارات التطبيقات والأجهزة"</string>
-    <string name="manage_notification_access_summary" msgid="2907135226478903997">"التحكّم في التطبيقات والأجهزة التي يمكنها قراءة الإشعارات"</string>
+    <string name="manage_notification_access_summary" msgid="2907135226478903997">"تحديد التطبيقات والأجهزة التي يمكنها قراءة الإشعارات"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"الوصول إلى إشعارات الملف الشخصي للعمل محظور"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -4353,7 +4357,7 @@
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"بعض الإشعارات"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"الإشعارات التي يمكنها مقاطعة عمل الميزة"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"السماح لجميع الإشعارات"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{عدم السماح لأي فئة صوتية بمقاطعة عمل الميزة}=1{السماح لـ {sound_category_1} بمقاطعة عمل الميزة}=2{السماح لـ {sound_category_1} و{sound_category_2} بمقاطعة عمل الميزة}=3{السماح لـ {sound_category_1} و{sound_category_2} و{sound_category_3} بمقاطعة عمل الميزة}few{السماح لـ {sound_category_1} و{sound_category_2} و# فئات صوتية أخرى بمقاطعة عمل الميزة}many{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}other{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{عدم السماح لأي فئة صوتية بمقاطعة عمل الميزة}=1{مقاطعة عمل الميزة من قِبل {sound_category_1} }=2{مقاطعة عمل الميزة من قِبل {sound_category_1} و{sound_category_2} }=3{مقاطعة عمل الميزة من قِبل {sound_category_1} و{sound_category_2} و{sound_category_3} }few{مقاطعة عمل الميزة من قِبل {sound_category_1} و{sound_category_2} و# فئات صوتية أخرى }many{مقاطعة عمل الميزة من قِبل {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى }other{مقاطعة عمل الميزة من قِبل {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى }}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"عدم السماح لأي عنصر بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"عدم السماح لأي مستخدم بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"السماح لبعض الأشخاص بمقاطعة عمل الميزة"</string>
@@ -4407,7 +4411,7 @@
     <string name="device_feedback" msgid="5351614458411688608">"إرسال تعليقات حول هذا الجهاز"</string>
     <string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"إدخال رقم التعريف الشخصي للمشرف"</string>
     <string name="switch_on_text" msgid="5664542327776075105">"مفعّل"</string>
-    <string name="switch_off_text" msgid="1315547447393646667">"غير مفعّلة"</string>
+    <string name="switch_off_text" msgid="1315547447393646667">"غير مفعّل"</string>
     <string name="nfc_setting_on" msgid="7701896496026725772">"مفعّلة"</string>
     <string name="nfc_setting_off" msgid="7142103438532732309">"غير مفعّلة"</string>
     <string name="screen_pinning_switch_on_text" msgid="6971386830247542552">"تفعيل"</string>
@@ -4826,8 +4830,8 @@
     <string name="notification_summary_none" msgid="9179312319023988089">"مفعّلة لكلّ التطبيقات"</string>
     <string name="apps_summary" msgid="4007416751775414252">"تم تثبيت <xliff:g id="COUNT">%1$d</xliff:g> تطبيق"</string>
     <string name="apps_summary_example" msgid="6034002063446955592">"٢٤ تطبيقًا مثبَّتًا"</string>
-    <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
-    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"وحدة التخزين الداخلية: <xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
+    <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> متاحة"</string>
+    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"وحدة التخزين الداخلية: <xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> متاحة"</string>
     <string name="display_summary" msgid="5526061030874717172">"السكون بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
     <string name="display_dashboard_summary" msgid="1599453894989339454">"المظهر الداكن وحجم الخط والسطوع"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"السكون بعد 10 دقائق من عدم النشاط"</string>
@@ -5749,7 +5753,7 @@
     <string name="work_profile_app_subtext" msgid="5043419461440127879">"العمل"</string>
     <string name="system_default_app_subtext" msgid="5212055189703164839">"الإعداد التلقائي للنظام"</string>
     <string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"لم يعد هذا الاختيار صالحًا. يُرجى إعادة المحاولة."</string>
-    <string name="quick_controls_lower" msgid="6675573610027367819">"أدوات التحكم بالأجهزة"</string>
+    <string name="quick_controls_lower" msgid="6675573610027367819">"التحكّم بالجهاز"</string>
     <string name="cards_passes_sentence" msgid="1866311782387946944">"البطاقات والتذاكر"</string>
     <string name="cards_passes_lower" msgid="2429722007109957877">"البطاقات والتذاكر"</string>
     <string name="power_menu_setting_name" msgid="7291642927216934159">"الضغط مع الاستمرار على زر التشغيل"</string>
@@ -5874,11 +5878,11 @@
     <string name="do_not_disturb_main_switch_title_on" msgid="6965566556539821313">"الإيقاف الآن"</string>
     <string name="do_not_disturb_main_switch_title_off" msgid="7088088515823752545">"التفعيل الآن"</string>
     <string name="night_light_main_switch_title" msgid="3428298022467805219">"استخدام ميزة \"الإضاءة الليلية\""</string>
-    <string name="nfc_main_switch_title" msgid="6295839988954817432">"‏استخدام الاتصالات القريبة المدى (NFC)"</string>
+    <string name="nfc_main_switch_title" msgid="6295839988954817432">"‏استخدام الاتصال القصير المدى (NFC)"</string>
     <string name="adaptive_battery_main_switch_title" msgid="3127477920505485813">"استخدام ميزة \"البطارية التكيُّفية\""</string>
     <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"استخدام ميزة \"السطوع التكيُّفي\""</string>
     <string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"‏استخدام ميزة \"الاتصال عبر Wi-Fi\""</string>
-    <string name="screen_saver_main_switch_title" msgid="256530705774121595">"استخدام شاشة التوقف"</string>
+    <string name="screen_saver_main_switch_title" msgid="256530705774121595">"استخدام شاشة الاستراحة"</string>
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"عرض كل التطبيقات"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"إعادة التوجيه الذكية"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"تم تفعيل ميزة \"إعادة التوجيه الذكية\"."</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 02bf12f..81e2ead 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -27,7 +27,7 @@
     <item msgid="2044919239591619902">"এছিয়া"</item>
     <item msgid="4758559452497348479">"অষ্ট্ৰেলিয়া"</item>
     <item msgid="2254507767835075885">"প্ৰশান্ত মহাসাগৰীয়"</item>
-    <item msgid="6471579645890342891">"সকলো"</item>
+    <item msgid="6471579645890342891">"আটাইবোৰ"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="8386012403457852396">"১৫ ছেকেণ্ড"</item>
@@ -216,7 +216,7 @@
     <item msgid="3441876902463317017">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="3771157789865587832">"আভ্যন্তৰীণ ডিভাইচ সঞ্চয়াগাৰ"</item>
+    <item msgid="3771157789865587832">"আভ্যন্তৰীণ ডিভাইচ ষ্ট’ৰেজ"</item>
     <item msgid="5501345333507193420">"গুচাব পৰা SD কাৰ্ড"</item>
     <item msgid="2362840341195111674">"ছিষ্টেমটোক সিদ্ধান্ত ল’বলৈ দিয়ক"</item>
   </string-array>
@@ -287,8 +287,8 @@
     <item msgid="7925495329948404955">"শৰীৰৰ ছেন্সৰসমূহ"</item>
     <item msgid="8163066895749904470">"চেল সম্প্ৰচাৰসমূহ পঢ়ক"</item>
     <item msgid="7621394050624063528">"নকল অৱস্থান"</item>
-    <item msgid="37519917674959757">"সঞ্চয়াগাৰত পঢ়ক"</item>
-    <item msgid="3868809525697401379">"সঞ্চয়াগাৰত লিখক"</item>
+    <item msgid="37519917674959757">"ষ্ট’ৰেজত পঢ়ক"</item>
+    <item msgid="3868809525697401379">"ষ্ট’ৰেজত লিখক"</item>
     <item msgid="2504191192460059817">"স্ক্ৰীন অন কৰক"</item>
     <item msgid="7905819538788103556">"একাউণ্টবোৰ বিচাৰক"</item>
     <item msgid="1675025662248079254">"নেপথ্যত চলাওক"</item>
@@ -354,8 +354,8 @@
     <item msgid="7883743426029759112">"শৰীৰৰ ছেন্সৰসমূহ"</item>
     <item msgid="2546206711741159825">"চেল সম্প্ৰচাৰবোৰ পঢ়ক"</item>
     <item msgid="2363460595607829243">"নকল অৱস্থান"</item>
-    <item msgid="3778165903878569143">"সঞ্চয়াগাৰ পঢ়ক"</item>
-    <item msgid="555939881912035315">"সঞ্চয়াগাৰত লিখক"</item>
+    <item msgid="3778165903878569143">"ষ্ট’ৰেজত পঢ়ক"</item>
+    <item msgid="555939881912035315">"ষ্ট’ৰেজত লিখক"</item>
     <item msgid="4281352581602735717">"স্ক্ৰীন অন কৰক"</item>
     <item msgid="346122795998225472">"একাউণ্টবোৰ বিচাৰক"</item>
     <item msgid="3756073389408535680">"নেপথ্যত চলাওক"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 5b65255..34ee857 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -43,9 +43,9 @@
     <string name="radioInfo_data_connected" msgid="8816467971633020141">"সংযোগ কৰা হ’ল"</string>
     <string name="radioInfo_data_suspended" msgid="2001254415431299603">"স্থগিত"</string>
     <string name="radioInfo_unknown" msgid="2892562356748600367">"অজ্ঞাত"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"ইউএছবি সঞ্চয়াগাৰ অসংলগ্ন কৰক"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰক"</string>
     <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"এছডি কাৰ্ড অসংলগ্ন কৰক"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"USB সঞ্চয়াগাৰ মচক"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"ইউএছবি ষ্ট’ৰেজ মচক"</string>
     <string name="sdcard_format" product="default" msgid="3676635435136326182">"এছডি কাৰ্ড মচক"</string>
     <string name="preview_pager_content_description" msgid="3762247188224576303">"পূৰ্বদৰ্শন"</string>
     <string name="preview_page_indicator_content_description" msgid="2790254666634885865">"পূৰ্বদৰ্শন কৰক, পৃষ্ঠা <xliff:g id="NUM_PAGES">%2$d</xliff:g> ৰ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
@@ -59,11 +59,11 @@
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"অধ্যায় ১১: অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ পান্নাৰ মহানগৰ"</string>
     <string name="font_size_preview_text_body" msgid="3323732544011097199">"ডৰথী আৰু তেওঁৰ বন্ধুসকলে যদিও সেউজীয়া চশমা পিন্ধি আছিল, বিস্ময়কৰ চহৰখনৰ চালে চকু ছাট মৰা ৰূপ দেখি প্ৰথমে তেওঁলোক স্তম্ভিত হৈ পৰিছিল। চহৰখনৰ ৰাস্তাৰ দুয়োফাল সেউজীয়া মাৰ্বলৰ দ্বাৰা সজা আৰু চিকমিক মুকুতাখচিত শাৰী শাৰী ঘৰেৰে ভৰি আছিল। ডৰথীহঁতে সেই একেই মাৰ্বলেৰে সজা এটা ৰাস্তাত খোজ কাঢ়িলে, য\'ত মাৰ্বলৰ টুকুৰাবিলাকৰ মাজে মাজে পান্নাৰ পটি দিয়া আছিল, যিবোৰ সূৰ্যৰ পোহৰত তিৰবিৰাই উঠিছিল। খিৰিকিৰ পাল্লাবোৰ সেউজীয়া কাঁচেৰে তৈয়াৰী আছিল, আনকি চহৰখনৰ ওপৰৰ আকাশখনো সেউজীয়া আভাৰে ভৰা আছিল আৰু সূৰ্যৰ পোহৰো দেখাত সেউজীয়া আছিল। \n\nচহৰখন বহুত মানুহেৰে ভৰি আছিল - পুৰুষ, মহিলা আৰু ল\'ৰা-ছোৱালী সকলোৱে ইফালে-সিফালে ফূৰ্তিত ঘিলঘিলাই ফুৰিছিল, আৰু তেওঁলোক সকলোৱে সেউজীয়া কাপোৰ পিন্ধি আছিল আৰু তেওঁলোকৰ গাৰ ৰঙো সেউজ-বুলীয়া আছিল। তেওঁলোকে ডৰথী আৰু তেওঁৰ সমনীয়াবিলাকৰ অদ্ভুত দলটোক আশ্বৰ্যৰ চকুৰে পিট-পিটকৈ চাইছিল আৰু সৰু সৰু ল\'ৰা-ছোৱালীবোৰে যেতিয়া সিংহটোক দেখিলে সিঁহতে ভয়তে ফাট মাৰি মাহঁতৰ পিছফালে গৈ লুকাই পৰিছিল, কিন্তু কোনেও ডৰথীহঁতৰ লগত কথা পতা নাছিল। ৰাস্তাটোত বহুতো দোকান আছিল আৰু সেইবোৰত থকা সকলো বস্তু সেউজীয়া ৰঙৰ আছিল। দোকানবোৰত সেউজীয়া মৰ্টন আৰু সেউজীয়া ভজা গোমধান বেচা হৈছিল, লগতে বেচা হৈছিল সেউজীয়া জোতা, সেউজীয়া টুপী আৰু হৰেক ৰকমৰ সেউজীয়া কাপোৰ-কানি। এঠাইত এটা মানুহে সেউজীয়া চৰ্বত বিক্ৰী কৰি আছিল, আৰু যেতিয়া ল\'ৰা-ছোৱালীকেইটামানে সেইয়া কিনিছিল, ডৰথীয়ে দেখা পাইছিল যে সিহঁতে দোকানীক দিয়া পইচাকেইটাও সেউজীয়া ৰঙৰ। \n\nচহৰখনত ঘোঁৰা বা অইন কোনো জন্তু নাই যেন লাগিছিল; পুৰুষসকলে সৰু সৰু সেউজীয়া ৰঙৰ ঠেলাত বস্তু ইফালে-সিফালে অনা-নিয়া কৰিছিল। সকলোকে অতিকে সুখী, পৰিতৃপ্ত আৰু সম্পদশালী যেন দেখা গৈছিল।"</string>
     <string name="font_size_save" msgid="206892409190870726">"ঠিক আছে"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="6071836464978826249">"ইউএছবি সঞ্চয়াগাৰ"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="6071836464978826249">"ইউএছবি ষ্ট’ৰেজ"</string>
     <string name="sdcard_setting" product="default" msgid="3713462184783824923">"এছডি কাৰ্ড"</string>
     <string name="bluetooth" msgid="8898478620943459654">"ব্লুটুথ"</string>
-    <string name="bluetooth_is_discoverable" msgid="4798961627677790935">"সকলো নিকটৱৰ্তী ব্লুটুথ ডিভাইচ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)এ বিচাৰি পাব পৰা"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="8122823110652921674">"সকলো নিকটৱৰ্তী ব্লুটুথ ডিভাইচত দৃশ্যমান"</string>
+    <string name="bluetooth_is_discoverable" msgid="4798961627677790935">"আটাইবোৰ নিকটৱৰ্তী ব্লুটুথ ডিভাইচ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)এ বিচাৰি পাব পৰা"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="8122823110652921674">"আটাইবোৰ নিকটৱৰ্তী ব্লুটুথ ডিভাইচত দৃশ্যমান"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="6181960579190879601">"অইন ব্লুটুথ ডিভাইচৰ বাবে দৃশ্যমান নহয়"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="3574936359739213455">"কেৱল যোৰা হৈ থকা ডিভাইচেহে বিচাৰি পাব"</string>
     <string name="bluetooth_visibility_timeout" msgid="7611781967900196353">"দৃশ্যমানতাৰ সময় উকলা"</string>
@@ -156,7 +156,7 @@
     <string name="connected_device_previously_connected_title" msgid="605808252622814415">"পূৰ্বৱৰ্তী সংযোগ হোৱা ডিভাইচবোৰ"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"আগতে সংযোগ কৰা"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"ব্লুটুথ অন কৰা হ’ল"</string>
-    <string name="previous_connected_see_all" msgid="7759413145713251328">"সকলো চাওক"</string>
+    <string name="previous_connected_see_all" msgid="7759413145713251328">"আটাইবোৰ চাওক"</string>
     <string name="date_and_time" msgid="1788358029823431692">"তাৰিখ আৰু সময়"</string>
     <string name="choose_timezone" msgid="1450780665958642147">"সময় মণ্ডল নিৰ্বাচন কৰক"</string>
     <!-- no translation found for intent_sender_data_label (1733806423295725392) -->
@@ -187,16 +187,16 @@
     <string name="radio_info_http_client_test" msgid="5673975677271544085">"HTTP ক্লায়েণ্ট পৰীক্ষা:"</string>
     <string name="ping_test_label" msgid="265427033290391845">"পিং টেষ্ট চলাওক"</string>
     <string name="sdcard_changes_instructions" msgid="2331969501845866957">"USB কেৱ\'ল পুনঃসংযোগ কৰাৰ পিছত পৰিবৰ্তনসমূহ স্থায়ী হ\'ব।"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="129059989000252994">"ইউএছবি সঞ্চয়াগাৰক গুচাব পৰা সঞ্চয়াগাৰ হিচাপে ব্যৱহাৰৰ ম\'ড সক্ষম কৰক"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="129059989000252994">"বিশাল ষ্ট’ৰেজ ইউএছবি সক্ষম কৰক"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="5298511430610207103">"সৰ্বমুঠ বাইট:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"ইউএছবি সঞ্চয়াগাৰ সংলগ্ন কৰা হোৱা নাই৷"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"ইউএছবি ষ্ট’ৰেজ সংলগ্ন কৰা হোৱা নাই।"</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"এছডি কাৰ্ড নাই৷"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="7721283102767669004">"উপলব্ধ বাইট:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"এছডি কাৰ্ডখনক গুচাব পৰা সঞ্চয়াগাৰ হিচাপে ব্যৱহাৰ কৰা হৈছে।"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"এছডি কাৰ্ডখন এটা বিশাল ষ্ট’ৰেজ ডিভাইচ হিচাপে ব্যৱহাৰ কৰা হৈছে।"</string>
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"এছডি কাৰ্ডখন এটা বিশাল ষ্ট’ৰেজ ডিভাইচ হিচাপে ব্যৱহাৰ কৰা হৈছে।"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"এতিয়া USB সঞ্চয়াগাৰ নিৰাপদে গুচাব পাৰে।"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"এতিয়া USB ষ্ট’ৰেজ নিৰাপদে গুচাব পাৰে।"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"এছডি কাৰ্ডখন এতিয়া সুৰক্ষিতভাৱে আঁতৰাব পাৰে।"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="209564009449909311">"ব্যৱহাৰ হৈ থকাৰ সময়তে ইউএছবি সঞ্চয়াগাৰ আঁতৰোৱা হৈছিল!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="209564009449909311">"ব্যৱহাৰ হৈ থকাৰ সময়তে ইউএছবি ষ্ট’ৰেজ আঁতৰোৱা হৈছিল!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"ব্যৱহাৰ হৈ থকাৰ সময়তে এছডি কাৰ্ড আঁতৰোৱা হৈছিল!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="5646588579332741943">"ব্যৱহৃত বাইট:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="8037280964384235345">"মিডিয়াৰ বাবে এছডি কাৰ্ড স্কেন কৰি থকা হৈছে…"</string>
@@ -213,7 +213,7 @@
       <item quantity="other">বাছনি কৰা ভাষাসমূহ আঁতৰাবনে?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"পাঠ অইন এটা ভাষাত দেখুওৱা হ\'ব।"</string>
-    <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"সকলো ভাষা আঁতৰাব নোৱাৰি"</string>
+    <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"আটাইবোৰ ভাষা আঁতৰাব নোৱাৰি"</string>
     <string name="dlg_remove_locales_error_message" msgid="6504279959974675302">"কমেও এটা পচন্দৰ ভাষা ৰাখক"</string>
     <string name="locale_not_translated" msgid="5079729745235316146">"কিছুমান এপত লভ্য নহবও পাৰে"</string>
     <string name="action_drag_label_move_up" msgid="3392196942330705015">"ওপৰলৈ নিয়ক"</string>
@@ -223,7 +223,7 @@
     <string name="action_drag_label_remove" msgid="1034900377796780568">"ভাষা আঁতৰাওক"</string>
     <string name="activity_picker_label" msgid="351250401590691126">"কাৰ্যকলাপ বাছক"</string>
     <string name="display_label" msgid="3056320781191343221">"স্ক্ৰীন"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="1850505156136467106">"ইউএছবি সঞ্চয়াগাৰ"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="1850505156136467106">"ইউএছবি ষ্ট’ৰেজ"</string>
     <string name="sd_card_settings_label" product="default" msgid="8715502912796241588">"এছডি কাৰ্ড"</string>
     <string name="proxy_settings_label" msgid="6300573815025557843">"প্ৰক্সি ছেটিং"</string>
     <string name="cancel" msgid="5780102414089664898">"বাতিল কৰক"</string>
@@ -248,8 +248,8 @@
     <string name="roaming_reenable_message" msgid="5150423860521673540">"আপুনি ডেটা ৰ\'মিং অফ হৈ থকা অৱস্থাত আপোনাৰ হ\'ম নেটৱৰ্কটো এৰি অহা বাবে ডেটা সংযোগ হেৰুৱাইছে।"</string>
     <string name="roaming_turn_it_on_button" msgid="6999283810847157816">"অন কৰক"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ৰ’মিঙৰ মাচুল প্ৰযোজ্য হ’ব পাৰে।"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="5629953315019604726">"আপুনি ডেটা ৰ’মিঙৰ অনুমতি দিলে ৰ’মিঙৰ মাচুলসমূহ প্ৰযোজ্য হ’ব পাৰে।\n\nএই ছেটিংটোৱে এই টেবলেটটোৰ সকলো ব্যৱহাৰকাৰীকে প্ৰভাৱান্বিত কৰে।"</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="3693719745119874126">"আপুনি ডেটা ৰ’মিঙৰ অনুমতি দিলে ৰ’মিঙৰ মাচুলসমূহ প্ৰযোজ্য হ’ব পাৰে।\n\nএই ছেটিংটোৱে এই ফ’নটোৰ সকলো ব্যৱহাৰকাৰীকে প্ৰভাৱান্বিত কৰে।"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="5629953315019604726">"আপুনি ডেটা ৰ’মিঙৰ অনুমতি দিলে ৰ’মিঙৰ মাচুলসমূহ প্ৰযোজ্য হ’ব পাৰে।\n\nএই ছেটিংটোৱে এই টেবলেটটোৰ আটাইবোৰ ব্যৱহাৰকাৰীকে প্ৰভাৱান্বিত কৰে।"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="3693719745119874126">"আপুনি ডেটা ৰ’মিঙৰ অনুমতি দিলে ৰ’মিঙৰ মাচুলসমূহ প্ৰযোজ্য হ’ব পাৰে।\n\nএই ছেটিংটোৱে এই ফ’নটোৰ আটাইবোৰ ব্যৱহাৰকাৰীকে প্ৰভাৱান্বিত কৰে।"</string>
     <string name="roaming_reenable_title" msgid="770824950144026180">"ডেটা ৰ\'মিঙৰ অনুমতি দিবনে?"</string>
     <string name="networks" msgid="5184501333492775095">"অপাৰেটৰ বাছনি"</string>
     <string name="sum_carrier_select" msgid="1669911795517995916">"এটা নেটৱৰ্ক অপাৰেটৰ বাছক"</string>
@@ -372,7 +372,7 @@
     <string name="security_settings_face_enroll_dialog_ok" msgid="1674650455786434426">"ঠিক আছে"</string>
     <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"মুখমণ্ডল অন্তৰ্ভুক্ত কৰাৰ সময় উকলিল। আকৌ চেষ্টা কৰক।"</string>
     <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"মুখমণ্ডল অন্তৰ্ভুক্ত কৰা কাৰ্যই কাম নকৰিলে।"</string>
-    <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"সকলো সাজু। ঠিকেই দেখা গৈছে।"</string>
+    <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"সম্পূৰ্ণ সাজু। ঠিকেই দেখা গৈছে।"</string>
     <string name="security_settings_face_enroll_done" msgid="3048687969498187442">"সম্পন্ন হ’ল"</string>
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="6835778900387289683">"ফেচ আনলকৰ কাৰ্যদক্ষতা উন্নত কৰক"</string>
     <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="7055780282999744813">"ফেচ আনলক সুবিধাটো আকৌ ছেট আপ কৰক"</string>
@@ -560,7 +560,7 @@
     <string name="fingerprint_add_max" msgid="8639321019299347447">"আপুনি <xliff:g id="COUNT">%d</xliff:g>লৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"আপুনি সৰ্বাধিক সংখ্যক ফিংগাৰপ্ৰিণ্টবোৰ যোগ কৰিছে"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"আৰু অধিক ফিংগাৰপ্ৰিণ্ট যোগ কৰিব নোৱাৰি"</string>
-    <string name="fingerprint_last_delete_title" msgid="4081475675646514726">"সকলো ফিংগাৰপ্ৰিণ্ট আঁতৰাবনে?"</string>
+    <string name="fingerprint_last_delete_title" msgid="4081475675646514726">"আটাইবোৰ ফিংগাৰপ্ৰিণ্ট আঁতৰাবনে?"</string>
     <string name="fingerprint_delete_title" msgid="1469865327307917858">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' আঁতৰাওক"</string>
     <string name="fingerprint_delete_message" msgid="1454995433333496541">"আপুনি এই অাঙুলিৰ চাপটো মচিব বিচাৰেনে?"</string>
     <string name="fingerprint_v2_delete_message" msgid="4136720729608391131">"এইটোৱে আপোনাৰ ডিভাইচত ষ্ট’ৰ হৈ থকা \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ৰ সৈতে জড়িত ফিংগাৰপ্ৰিণ্টৰ প্ৰতিচ্ছবি আৰু মডেল মচি পেলায়"</string>
@@ -666,7 +666,7 @@
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"পাছৱৰ্ড • মুখাৱয়ব • ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ফেচ অথবা ফিংগাৰপ্ৰিণ্টৰ অবিহনে অব্যাহত ৰাখক"</string>
     <string name="biometrics_unlock_title" msgid="616524056055233041">"আপুনি নিজৰ মুখাৱয়ব অথবা ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি নিজৰ ফ’নটো আনলক কৰিব পাৰে। সুৰক্ষাৰ বাবে এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ আৱশ্যক হয়।"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"নাই"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ছোৱাইপ কৰক"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"আৰ্হি"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"আপুনি এই পিনটো অন্যটো ডিভাইচত টাইপ কৰিবলগীয়াও হ’ব পাৰে৷"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"আপুনি এই পাছকীটো অন্য ডিভাইচত টাইপ কৰিবলগীয়াও হ’ব পাৰে৷"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ইয়াৰ সৈতে যোৰা লগাবলৈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এইটোৱে পাছকীটো দেখুওৱাটো নিশ্চিত কৰক:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"সংগতিপূৰ্ণ ছেটৰ সৈতে পেয়াৰ কৰিবলৈ নিশ্চিত কৰক"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ইয়াৰ পৰা:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এইটো ডিভাইচৰ সৈতে যোৰা লগাবনে?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"যোৰা লগাবলৈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>তাত টাইপ কৰক:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তাৰ পিছত ৰিটাৰ্ন বা এণ্টাৰ দবাওক।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপোনাৰ সম্পৰ্কসূচী আৰু কলৰ ইতিহাসত প্ৰৱেশ কৰিবলৈ অনুমতি দিয়ক"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"সংযোগ কৰিব পৰা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ডিভাইচৰ বিষয়ে সবিশেষ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ডিভাইচৰ ব্লুটুথৰ ঠিকনা: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ডিভাইচৰ ব্লুটুথ ঠিকনা:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ডিভাইচটো পাহৰিবনে?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"জড়িত হৈ থকাটো আঁতৰাওক"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"এপ্‌টোৰ সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ছেটিং মনত ৰাখক"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"সৰ্বাধিক সংযোজিত হৈ থকা ব্লুটুথ অডিঅ’ ডিভাইচৰ সংখ্যা"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"সৰ্বাধিক সংখ্যক সংযুক্ত হৈ থকা ব্লুটুথ অডিঅ\' ডিভাইচ বাছনি কৰক"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ষ্টেক ডিবাগ লগ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ষ্টেক লগিঙৰ স্তৰ বৃদ্ধি কৰক"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাষ্ট"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"আইনা"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"বেতাঁৰ ডিছপ্লে’ সক্ষম কৰক"</string>
@@ -1089,8 +1093,8 @@
     <string name="wifi_wps_available_second_item" msgid="1717024103303480804">" (WPS উপলব্ধ)"</string>
     <string name="wifi_carrier_connect" msgid="4511538300946413213">"বাহকৰ ৱাই-ফাই নেটৱৰ্ক"</string>
     <string name="wifi_carrier_content" msgid="2876499905644083615">"<xliff:g id="NAME">%1$s</xliff:g>ৰ মাধ্যমেৰে সংযোগ কৰক"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"অৱস্থানৰ সঠিকতা বঢ়াবলৈ আৰু অন্যান্য কামৰ বাবে, <xliff:g id="APP_NAME">%1$s</xliff:g>এ ৱাই-ফাই অফ হৈ থাকিলেও নেটৱৰ্ক স্কেনিং অন কৰিব বিচাৰিছে।\n\nস্কেন কৰিব বিচৰা সকলো এপকে এই অনুমতি দিবনে?"</string>
-    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"অৱস্থানৰ সঠিকতা বঢ়াবলৈ আৰু অন্যান্য কামৰ বাবে, এটা অজ্ঞাত এপে ৱাই-ফাই অফ হৈ থাকিলেও নেটৱৰ্ক স্কেনিং অন কৰিব বিচাৰিছে।\n\nস্কেন কৰিব বিচৰা সকলো এপকে এই অনুমতি দিবনে?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"অৱস্থানৰ সঠিকতা বঢ়াবলৈ আৰু অন্যান্য কামৰ বাবে, <xliff:g id="APP_NAME">%1$s</xliff:g>এ ৱাই-ফাই অফ হৈ থাকিলেও নেটৱৰ্ক স্কেনিং অন কৰিব বিচাৰিছে।\n\nস্কেন কৰিব বিচৰা আটাইবোৰ এপকে এই অনুমতি দিবনে?"</string>
+    <string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"অৱস্থানৰ সঠিকতা বঢ়াবলৈ আৰু অন্যান্য কামৰ বাবে, এটা অজ্ঞাত এপে ৱাই-ফাই অফ হৈ থাকিলেও নেটৱৰ্ক স্কেনিং অন কৰিব বিচাৰিছে।\n\nস্কেন কৰিব বিচৰা আটাইবোৰ এপকে এই অনুমতি দিবনে?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="93691286302680448">"এইটো অভাৰফ্ল\' মেনুত থকা উচ্চখাপৰ ছেটিঙলৈ গৈ অফ কৰক।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"অনুমতি দিয়ক"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"প্ৰত্যাখ্যান কৰক"</string>
@@ -1119,7 +1123,7 @@
     <string name="wifi_failed_save_message" msgid="1830279872341387120">"নেটৱৰ্ক ছেভ কৰাত ব্যৰ্থ হ’ল"</string>
     <string name="wifi_cancel" msgid="6698897376888935410">"বাতিল কৰক"</string>
     <string name="wifi_forget_dialog_title" msgid="4363829200968563164">"নেটৱৰ্কটো পাহৰেনে?"</string>
-    <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"এই নেটৱৰ্কৰ সকলো পাছৱৰ্ড মচি পেলোৱা হ\'ব"</string>
+    <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"এই নেটৱৰ্কৰ আটাইবোৰ পাছৱৰ্ড মচি পেলোৱা হ\'ব"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
       <item quantity="one">%d নেটৱৰ্ক</item>
       <item quantity="other">%d নেটৱৰ্ক</item>
@@ -1495,11 +1499,11 @@
     <string name="device_status" msgid="7988547478034984649">"স্থিতি"</string>
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"বেটাৰীৰ স্থিতি, নেটৱৰ্ক আৰু অন্যান্য তথ্য"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"ফ\'ন নম্বৰ, বেতাঁৰ সংকেত ইত্যাদি"</string>
-    <string name="storage_settings" msgid="7472188817781592677">"সঞ্চয়াগাৰ"</string>
+    <string name="storage_settings" msgid="7472188817781592677">"ষ্ট’ৰেজ"</string>
     <string name="storage_settings_for_app" msgid="229425418984637483">"ষ্ট’ৰেজ আৰু কেশ্ব"</string>
-    <string name="storage_usb_settings" msgid="7058142934214211583">"সঞ্চয়াগাৰ"</string>
+    <string name="storage_usb_settings" msgid="7058142934214211583">"ষ্ট’ৰেজ"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"ষ্ট\'ৰেজৰ ছেটিং"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"ইউএছবি সঞ্চয়াগাৰ অসংলগ্ন কৰক, উপলব্ধ খালী ঠাই চাওক"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰক, উপলব্ধ খালী ঠাই চাওক"</string>
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"এছডি কাৰ্ড অসংলগ্ন কৰক, উপলব্ধ খালী ঠাই চাওক"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (ছিম শ্ল\'ট %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"চাবলৈ ছেভ কৰি থোৱা নেটৱর্ক বাছনি কৰক"</string>
@@ -1536,8 +1540,8 @@
     <string name="status_serial_number" msgid="9060064164331466789">"ক্ৰমিক নম্বৰ"</string>
     <string name="status_up_time" msgid="1274778533719495438">"চলি থকা সময়"</string>
     <string name="status_awake_time" msgid="2573925324168081586">"জাগ্ৰত হৈ থকা সময়"</string>
-    <string name="internal_memory" msgid="1869518160077033848">"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</string>
-    <string name="sd_memory" product="nosdcard" msgid="5456718463397723781">"ইউএছবি সঞ্চয়াগাৰ"</string>
+    <string name="internal_memory" msgid="1869518160077033848">"আভ্যন্তৰীণ ষ্ট’ৰেজ"</string>
+    <string name="sd_memory" product="nosdcard" msgid="5456718463397723781">"ইউএছবি ষ্ট’ৰেজ"</string>
     <string name="sd_memory" product="default" msgid="3098344183202722455">"SD কাৰ্ড"</string>
     <string name="memory_available" msgid="712528795743654737">"উপলব্ধ"</string>
     <string name="memory_available_read_only" msgid="3201969221573511590">"উপলব্ধ (ৰিড-অনলি)"</string>
@@ -1550,11 +1554,11 @@
     <string name="memory_music_usage" msgid="8100634000114206429">"অডিঅ\' (সংগীত, ৰিংট\'ন, পডকাষ্ট আদি)"</string>
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"অন্যান্য ফাইলসমূহ"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"কেশ্ব কৰা হোৱা ডেটা"</string>
-    <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"শ্বেয়াৰ কৰা হোৱা সঞ্চয়াগাৰ অসংলগ্ন কৰিবনে?"</string>
+    <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"শ্বেয়াৰ কৰা হোৱা ষ্ট’ৰেজ অসংলগ্ন কৰক"</string>
     <string name="sd_eject" product="default" msgid="8062832622096296251">"SD কাৰ্ড অসংলগ্ন কৰক"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"আভ্যন্তৰীণ ইউএছবি সঞ্চয়াগাৰ অসংলগ্ন কৰক"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"আভ্যন্তৰীণ ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰক"</string>
     <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"এছডি কাৰ্ডখন অসংলগ্ন কৰিলে আপুনি সুৰক্ষিতভাৱে ইয়াক আঁতৰাব পাৰিব"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"সংলগ্ন কৰিবলৈ ইউএছবি সঞ্চয়াগাৰ ভৰাওক"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"সংলগ্ন কৰিবলৈ ইউএছবি ষ্ট’ৰেজ ভৰাওক"</string>
     <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"সংলগ্ন কৰিবলৈ এছডি কাৰ্ড ভৰাওক"</string>
     <string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"ইউএছবি ষ্ট’ৰেজ সংলগ্ন কৰক"</string>
     <string name="sd_mount" product="default" msgid="5279813999455776169">"SD কাৰ্ড সংলগ্ন কৰক"</string>
@@ -1562,16 +1566,16 @@
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"ইউএছবি ষ্ট’ৰেজ মচক"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"এছডি কাৰ্ড মচক"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"আভ্যন্তৰীণ ইউএছবি সঞ্চয়াগাৰৰ পৰা সকলো ডেটা মচক, যেনে সংগীত আৰু ফ\'টোবোৰ"</string>
-    <string name="sd_format_summary" product="default" msgid="60583152211068164">"সংগীত আৰু ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা সকলো ডেটা মোহাৰে"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"আভ্যন্তৰীণ ইউএছবি ষ্ট’ৰেজৰ পৰা আটাইখিনি ডেটা মচক, যেনে সংগীত আৰু ফট’"</string>
+    <string name="sd_format_summary" product="default" msgid="60583152211068164">"সংগীত আৰু ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা আটাইবোৰ ডেটা মচে"</string>
     <string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"এমটিপি বা পিটিপি ফাংশ্বন সক্ৰিয় হৈ আছে"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"ইউএছবি সঞ্চয়াগাৰ আনমাউণ্ট কৰিবনে?"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰিবনে?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"এছডি কাৰ্ড অসংলগ্ন কৰেনে?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"আপুনি যদি USB সঞ্চয়াগাৰ অসংলগ্ন কৰে, তেন্তে আপুনি ব্যৱহাৰ কৰি থকা কিছুমান এপে কাম কৰা বন্ধ কৰিব আৰু সেইবোৰ আপুনি USB সঞ্চয়াগাৰ আকৌ সংলগ্ন নকৰালৈ উপলব্ধ নহ’ব।"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"আপুনি যদি ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰে, তেন্তে আপুনি ব্যৱহাৰ কৰি থকা কিছুমান এপে কাম কৰা বন্ধ কৰিব আৰু সেইবোৰ আপুনি ইউএছবি ষ্ট’ৰেজ আকৌ সংলগ্ন নকৰালৈ উপলব্ধ নহ’ব।"</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"আপুনি যদি এছডি কাৰ্ড অসংলগ্ন কৰে, তেন্তে আপুনি ব্যৱহাৰ কৰি থকা কিছুমান এপে কাম কৰা বন্ধ কৰিব আৰু সেইবোৰ আপুনি এছডি কাৰ্ড আকৌ সংলগ্ন নকৰালৈকে উপলব্ধ নহ’ব৷"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"ইউএছবি সঞ্চয়াগাৰ আনমাউণ্ট কৰিব পৰা নগ\'ল। পিছত আকৌ চেষ্টা কৰক।"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰিব পৰা নগ’ল। পাছত আকৌ চেষ্টা কৰক।"</string>
     <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD কাৰ্ড অসংলগ্ন কৰিব পৰা নগ\'ল। পিছত আকৌ চেষ্টা কৰক।"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"ইউএছবি ষ্ট’ৰেজ অসংলগ্ন কৰা হ’ব।"</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"এছডি কাৰ্ড অসংলগ্ন কৰা হ\'ব।"</string>
@@ -1602,8 +1606,8 @@
     <string name="usb_midi_title" msgid="1139558846427981761">"এমআইডিআই"</string>
     <string name="usb_midi_summary" msgid="1842457325845863840">"আপোনাৰ কম্পিউটাৰত থকা এমআইডিআই ছফটৱেৰৰ লগত ইউএছবিৰ যোগেৰে এমআইডিআই-সক্ষম এপ্লিকেশ্বনক কাম কৰিবলৈ দিয়ে।"</string>
     <string name="storage_other_users" msgid="7017206190449510992">"অন্য ব্যৱহাৰকাৰীসকল"</string>
-    <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইচৰ সঞ্চয়াগাৰ"</string>
-    <string name="storage_external_title" msgid="8984075540312137135">"প\'ৰ্টেবল সঞ্চয়াগাৰ"</string>
+    <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইচৰ ষ্ট’ৰেজ"</string>
+    <string name="storage_external_title" msgid="8984075540312137135">"প’ৰ্টেবল ষ্ট’ৰেজ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>ৰ ব্যৱহৃত"</string>
     <string name="storage_mount_success" msgid="393972242641313135">"<xliff:g id="NAME">%1$s</xliff:g> সংলগ্ন কৰা হৈছে"</string>
@@ -1617,23 +1621,23 @@
     <string name="storage_dialog_unmountable" msgid="1761107904296941687">"<xliff:g id="NAME_0">^1</xliff:g> ব্যৱহাৰযোগ্য হৈ থকা নাই। \n\nইয়াক <xliff:g id="NAME_1">^1</xliff:g> ব্যৱহাৰ কৰিবলৈ আপুনি প্ৰথমে তাক ছেট আপ কৰিব লাগিব।"</string>
     <string name="storage_internal_format_details" msgid="8922023528848861812">"ফৰ্মেট কৰাৰ পাছত আপুনি <xliff:g id="NAME_0">^1</xliff:g>ক অইন ডিভাইচত ব্যৱহাৰ কৰিব পাৰিব। \n\n<xliff:g id="NAME_1">^1</xliff:g>ত থকা আটাইখিনি ডেটা মচা হ’ব। গতিকে, প্ৰথমে বেকআপ লোৱাৰ কথা বিবেচনা কৰক। \n\n"<b>"ফট’ আৰু অইন মিডিয়াৰ বেকআপ লওক"</b>" \nএই ডিভাইচত থকা অইন এটা ষ্ট’ৰেজলৈ বা এডাল ইউএছবি কেবলৰ যোগেৰে এটা কম্পিউটাৰলৈ আপোনাৰ মিডিয়া স্থানান্তৰ কৰক। \n\n"<b>"এপ্বোৰৰ বেকআপ লওক"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g>ত ষ্ট’ৰ হৈ থকা আটাইবোৰ এপ্ আনইনষ্টল কৰা হ’ব আৰু সেইবিলাকৰ ডেটাসমূহ মচা হ’ব। এই এপ্বোৰ ৰাখিবলৈ এই ডিভাইত থকা বিকল্প ষ্ট’ৰেজলৈ স্থানান্তৰ কৰক।"</string>
     <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"আপুনি যেতিয়া <xliff:g id="NAME_0">^1</xliff:g>ক বাহিৰলৈ উলিয়াএ, ইয়াৰ ভিতৰত থকা এপবোৰে কাম কৰা বন্ধ কৰিব আৰু ইয়াক আকৌ নভৰোৱালৈকে ইয়াত থকা মিডিয়া ফাইলবোৰ উপলব্ধ নহ’ব।"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g>ক এইটো ডিভাইচত মাত্ৰ কাম কৰিব পৰাকৈ আৰ্হিত লগোৱা হৈছে। ই আৰু কোনো ডিভাইচতে কাম নকৰিব।"</string>
-    <string name="storage_internal_forget_details" msgid="5606507270046186691">"<xliff:g id="NAME">^1</xliff:g>ত থকা এপসমূহ, ফটো বা ডেটা ব্যৱহাৰ কৰিবলৈ ইয়াক পুনৰ ডিভাইচত ভৰাওক। \n\nইয়াৰ উপৰিও, যদি ডিভাইচটো উপলব্ধ নহয়, তেতিয়া আপুনি এই সঞ্চয়াগাৰ ইচ্ছা কৰিলে পাহৰি যাব পাৰিব। \n\nযদি আপুনি পাহৰি যাবলৈ বিচাৰে, তেতিয়া ডিভাইচত থকা সকলো ডেটা হেৰুৱাব। \n\nআপুনি এপসমূহ পিছত আকৌ ইনষ্টল কৰিব পাৰে, কিন্তু এই ডিভাইচত জমা হৈ থকা সেই এপবিলাকৰ কোনো ডেটা পুনৰ ঘূৰাই নাপাব।"</string>
+    <string name="storage_internal_forget_details" msgid="5606507270046186691">"<xliff:g id="NAME">^1</xliff:g>ত থকা এপ্‌সমূহ, ফট’ বা ডেটা ব্যৱহাৰ কৰিবলৈ ইয়াক পুনৰ ডিভাইচত ভৰাওক। \n\nইয়াৰ উপৰিও, যদি ডিভাইচটো উপলব্ধ নহয়, তেতিয়া আপুনি এই ষ্ট’ৰেজ ইচ্ছা কৰিলে পাহৰি যাব পাৰিব। \n\nযদি আপুনি পাহৰি যাবলৈ বিচাৰে, তেতিয়া ডিভাইচত থকা আটাইখিনি ডেটা হেৰুৱাব। \n\nআপুনি এপ্‌সমূহ পাছত আকৌ ইনষ্টল কৰিব পাৰে, কিন্তু এই ডিভাইচত জমা হৈ থকা সেই এপ্‌সমূহৰ কোনো ডেটা পুনৰ ঘূৰাই নাপাব।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"<xliff:g id="NAME">^1</xliff:g>ক পাহৰিব বিচাৰেনে?"</string>
-    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"এই <xliff:g id="NAME">^1</xliff:g>ত সঞ্চিত সকলো এপ্, ফট\' আৰু ডেটা চিৰদিনৰ কাৰণে হেৰুৱাব।"</string>
+    <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"এই <xliff:g id="NAME">^1</xliff:g>ত সঞ্চিত আটাইবোৰ এপ্, ফট\' আৰু ডেটা চিৰদিনৰ কাৰণে হেৰুৱাব।"</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"ছিষ্টেমত Android সংস্কৰণ <xliff:g id="VERSION">%s</xliff:g> চলিবলৈ দৰকাৰী ফাইল অন্তৰ্ভুক্ত হৈ আছে"</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"আপোনাৰ <xliff:g id="NAME">^1</xliff:g> ছেট আপ কৰক"</string>
     <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"প’ৰ্টেবল ষ্ট’ৰেজ হিচাপে ব্যৱহাৰ কৰক"</string>
     <string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"ডিভাইচসমূহৰ মাজত ফট\' আৰু অন্যান্য মিডিয়া স্থানান্তৰণৰ বাবে৷"</string>
-    <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"আভ্যন্তৰিণ সঞ্চয়াগাৰ হিচাপে ব্যৱহাৰ কৰক"</string>
+    <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"আভ্যন্তৰীণ ষ্ট’ৰেজ হিচাপে ব্যৱহাৰ কৰক"</string>
     <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"ফটো আৰু এপৰ লগতে সকলো বস্তু মাত্ৰ এই ডিভাইচটোত জমা কৰিবৰ বাবে। ফৰমেটিং কৰাৰ দৰকাৰ যাৰ বাবে ই কোনো অইন ডিভাইচত কাম নকৰিব।"</string>
-    <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"আভ্যন্তৰীণ সঞ্চয়াগাৰ হিচাপে ফৰ্মেট কৰক"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"এইটো সুৰক্ষিত কৰি তুলিবলৈ <xliff:g id="NAME_0">^1</xliff:g>ক ফৰ্মেট কৰা দৰকাৰ৷ \n\nফৰ্মেট কৰাৰ পিছত, এই <xliff:g id="NAME_1">^1</xliff:g> এ কেৱল এইটো ডিভাইচতহে কাম কৰিব৷ \n\n"<b>"ফৰ্মেট কৰিলে বৰ্তমান <xliff:g id="NAME_2">^1</xliff:g>ত সঞ্চিত সকলো ডেটা মচি পেলাব৷"</b>" ডেটা নেহেৰুৱাবলৈ, ইয়াৰ বেকআপ লোৱাৰ কথা বিবেচনা কৰক৷"</string>
-    <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"প\'ৰ্টেবল সঞ্চয়াগাৰ কৰি ফৰমেট কৰক"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"এই কামৰ বাবে <xliff:g id="NAME_0">^1</xliff:g>ক ফৰমেট কৰা দৰকাৰ। \n\n"<b>"ফৰমেট কৰিলে বৰ্তমান <xliff:g id="NAME_1">^1</xliff:g>ত থকা সকলো ডেটা মচা যাব।"</b>" ডেটা হেৰুৱাৰ পৰা হাত সাৰিবলৈ, প্ৰথমে ইয়াৰ বেকআপ লোৱাৰ কথা বিবেচনা কৰক।"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="4898014527956178762">"আভ্যন্তৰীণ ষ্ট’ৰেজ হিচাপে ফৰ্মেট কৰক"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="5514665245241830772">"এইটো সুৰক্ষিত কৰি তুলিবলৈ <xliff:g id="NAME_0">^1</xliff:g>ক ফৰ্মেট কৰা দৰকাৰ৷ \n\nফৰ্মেট কৰাৰ পাছত, এই <xliff:g id="NAME_1">^1</xliff:g> এ কেৱল এইটো ডিভাইচতহে কাম কৰিব৷ \n\n"<b>"ফৰ্মেট কৰিলে বৰ্তমান <xliff:g id="NAME_2">^1</xliff:g>ত সঞ্চিত আটাইবোৰ ডেটা মচি পেলাব৷"</b>" ডেটা নেহেৰুৱাবলৈ, ইয়াৰ বেকআপ লোৱাৰ কথা বিবেচনা কৰক৷"</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="649252654496577680">"প’ৰ্টেবল ষ্ট’ৰেজ হিচাপে ফৰ্মেট কৰক"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="6219883780307218266">"এই কামৰ বাবে <xliff:g id="NAME_0">^1</xliff:g>ক ফৰমেট কৰা দৰকাৰ। \n\n"<b>"ফৰমেট কৰিলে বৰ্তমান <xliff:g id="NAME_1">^1</xliff:g>ত থকা আটাইবোৰ ডেটা মচা যাব।"</b>" ডেটা হেৰুৱাৰ পৰা হাত সাৰিবলৈ, প্ৰথমে ইয়াৰ বেকআপ লোৱাৰ কথা বিবেচনা কৰক।"</string>
     <string name="storage_wizard_format_confirm_next" msgid="4412063054982084056">"মচক আৰু ফৰমেট কৰক"</string>
     <string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"<xliff:g id="NAME">^1</xliff:g>ক ফৰ্মেট কৰি থকা হৈছে…"</string>
     <string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"ফৰমেট হৈ থাকোঁতে <xliff:g id="NAME">^1</xliff:g>ক আঁতৰ নকৰিব।"</string>
-    <string name="storage_wizard_migrate_title" msgid="3013711737005104623">"নতুন সঞ্চয়াগাৰলৈ ডেটা স্থানান্তৰ কৰক"</string>
+    <string name="storage_wizard_migrate_title" msgid="3013711737005104623">"নতুন ষ্ট’ৰেজলৈ ডেটা স্থানান্তৰ কৰক"</string>
     <string name="storage_wizard_migrate_body" msgid="1630853797296198275">"আপুনি আপোনাৰ ফট’, ফাইল আৰু কিছুমান এপ্ এই নতুন <xliff:g id="NAME">^1</xliff:g>লৈ নিব পাৰে। \n\nএই কামত প্ৰায় <xliff:g id="TIME">^2</xliff:g> সময় লাগে আৰু ই আভ্যন্তৰীণ ষ্ট’ৰেজৰ পৰা <xliff:g id="SIZE">^3</xliff:g> ঠাই খালী কৰিব। এই প্ৰক্ৰিয়া চলি থকা সময়ত কিছুমান এপে কাম নকৰিব।"</string>
     <string name="storage_wizard_migrate_now" msgid="175023718337037181">"এতিয়াই স্থানান্তৰ কৰক"</string>
     <string name="storage_wizard_migrate_later" msgid="6573789572520980112">"পিছত স্থানান্তৰ কৰক"</string>
@@ -1643,7 +1647,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="462238335086734131">"ডেটা স্থানান্তৰ কৰা কাম হৈ আছে…"</string>
     <string name="storage_wizard_migrate_details" msgid="7474061662976940407">"লৰচৰ কৰাৰ সময়ত: \n• <xliff:g id="NAME">^1</xliff:g> নাঁতৰাব। \n• কিছুমান এপে সঠিকভাবে কাম নকৰিব। \n• ডিভাইচ চাৰ্জ কৰি ৰাখক।"</string>
     <string name="storage_wizard_ready_title" msgid="3093468548660255543">"আপোনাৰ <xliff:g id="NAME">^1</xliff:g> ব্যৱহাৰ কৰিবৰ কাৰণে সাজু"</string>
-    <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"ফট\' আৰু অন্যান্য মিডিয়াৰ সৈতে ব্যৱহাৰ কৰিবলৈ আপোনাৰ <xliff:g id="NAME">^1</xliff:g> ছেট কৰা আছে৷"</string>
+    <string name="storage_wizard_ready_external_body" msgid="45040717412844114">"ফট\' আৰু অন্যান্য মিডিয়াৰ সৈতে ব্যৱহাৰ কৰিবলৈ আপোনাৰ <xliff:g id="NAME">^1</xliff:g> সম্পূৰ্ণ সাজু৷"</string>
     <string name="storage_wizard_ready_internal_body" msgid="7734817996475607447">"আপোনাৰ নতুন <xliff:g id="NAME">^1</xliff:g>এ কাম কৰি আছে৷ \n\nএইটো ডিভাইচলৈ ফট\', ফাইল আৰু এপ্ ডেটা স্থানান্তৰ কৰিবলৈ, ছেটিং &gt; ষ্ট\'ৰেজলৈ যাওক৷"</string>
     <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"স্থানান্তৰ কৰক <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"<xliff:g id="APP">^1</xliff:g> আৰু ইয়াৰ ডেটা <xliff:g id="NAME_0">^2</xliff:g> স্থানান্তৰ কৰিবলৈ কিছু সময় মাত্ৰ লাগিব। স্থানান্তৰ কৰা কাৰ্য সম্পূৰ্ণ নোহোৱালৈকে আপুনি এপ ব্যৱহাৰ কৰিব নোৱাৰিব। \n\nস্থানান্তৰ কৰা সময়ত <xliff:g id="NAME_1">^2</xliff:g> আঁতৰাই নিদিব।"</string>
@@ -1653,23 +1657,23 @@
     <string name="storage_wizard_move_progress_cancel" msgid="3494022998599718937">"স্থানান্তৰণ বাতিল কৰক"</string>
     <string name="storage_wizard_slow_body" msgid="8293565076885232029">"<xliff:g id="NAME_0">^1</xliff:g> লেহেমীয়া যেন দেখা গৈছে। \n\nআপুনি অব্যাহত ৰাখিব পাৰে, কিন্তু এই অৱস্থানলৈ স্থানান্তৰ কৰা হোৱা এপসমূহ ভালকৈ নচলিব পাৰে আৰু ডেটা স্থানান্তৰণ হওতে প্ৰয়োজনতকৈ বেছি সময় লাগিব পাৰে। \n\nউত্তম ফলাফলৰ বাবে এটা দ্ৰুত <xliff:g id="NAME_1">^1</xliff:g> ব্যৱহাৰৰ কথা বিবেচনা কৰক।"</string>
     <string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"আপুনি এই <xliff:g id="NAME">^1</xliff:g> কেনেদৰে ব্যৱহাৰ কৰিব খোজে?"</string>
-    <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="1884468440013151482">"অতিৰিক্ত টেবলেট সঞ্চয়াগাৰৰ ব্যৱহাৰ"</string>
+    <string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="1884468440013151482">"অতিৰিক্ত টেবলেট ষ্ট’ৰেজৰ ব্যৱহাৰ"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="2907833056467441047">"কেৱল এইটো টেবলেটত থকা এপ্, ফাইল আৰু মিডিয়াৰ বাবে"</string>
-    <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="3278694259614995649">"টেবলেটৰ সঞ্চয়াগাৰ"</string>
-    <string name="storage_wizard_init_v2_internal_title" product="default" msgid="5941952998075252284">"অতিৰিক্ত ফ\'ন সঞ্চয়াগাৰৰ ব্যৱহাৰ"</string>
+    <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="3278694259614995649">"টেবলেটৰ ষ্ট’ৰেজ"</string>
+    <string name="storage_wizard_init_v2_internal_title" product="default" msgid="5941952998075252284">"অতিৰিক্ত ফ’ন ষ্ট’ৰেজৰ ব্যৱহাৰ"</string>
     <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="3022584310096954875">"কেৱল এইটো ফ\'নত থকা এপ্, ফাইল আৰু মিডিয়াৰ বাবে"</string>
-    <string name="storage_wizard_init_v2_internal_action" product="default" msgid="5645732875040797464">"ফ\'নৰ সঞ্চয়াগাৰ"</string>
+    <string name="storage_wizard_init_v2_internal_action" product="default" msgid="5645732875040797464">"ফ’নৰ ষ্ট’ৰেজ"</string>
     <string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"বা"</string>
-    <string name="storage_wizard_init_v2_external_title" msgid="8129096036551264207">"প’ৰ্টেবল সঞ্চয়াগাৰৰ ব্যৱহাৰ"</string>
+    <string name="storage_wizard_init_v2_external_title" msgid="8129096036551264207">"প’ৰ্টেবল ষ্ট’ৰেজৰ ব্যৱহাৰ"</string>
     <string name="storage_wizard_init_v2_external_summary" msgid="6436419488235871823">"ডিভাইচৰ মাজত ফট\' আৰু অন্যান্য মিডিয়া স্থানান্তৰণৰ বাবে।"</string>
-    <string name="storage_wizard_init_v2_external_action" msgid="781928899530539860">"প\'ৰ্টেবল সঞ্চয়াগাৰ"</string>
+    <string name="storage_wizard_init_v2_external_action" msgid="781928899530539860">"প’ৰ্টেবল ষ্ট’ৰেজ"</string>
     <string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"পিছত ছেট আপ কৰক"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"এই <xliff:g id="NAME">^1</xliff:g> খন ফৰমেট কৰেনে?"</string>
     <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"এই <xliff:g id="NAME_0">^1</xliff:g> খনক এপ্, ফাইল আৰু মিডিয়া জমা কৰি ৰাখিবলৈ ফৰমেট কৰা প্ৰয়োজন। \n\nফৰমেট কৰিলে <xliff:g id="NAME_1">^2</xliff:g>ত ইতিমধ্যে থকা সকলো সমল মচা যাব। সমল হেৰুওৱাৰ পৰা হাত সাৰিবলৈ অইন এখন <xliff:g id="NAME_2">^3</xliff:g>ত বা অইন এটা ডিভাইচত সেইবোৰৰ বেক আপ লৈ থওক।"</string>
     <string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"<xliff:g id="NAME">^1</xliff:g> ফৰমেট কৰক"</string>
     <string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"সমল <xliff:g id="NAME">^1</xliff:g>লৈ স্থানান্তৰ কৰেনে?"</string>
-    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"আপুনি <xliff:g id="NAME">^1</xliff:g>লৈ ফাইল, মিডিয়া আৰু কিছুমান নিৰ্দিষ্ট এপ্ স্থানান্তৰ কৰিব পাৰে। \n\nএই কাৰ্যই আপোনাৰ টেবলেটৰ সঞ্চয়াগাৰত <xliff:g id="SIZE">^2</xliff:g> ঠাই মুকলি কৰিব আৰু এই কাম কৰোঁতে প্ৰায় <xliff:g id="DURATION">^3</xliff:g> লাগিব।"</string>
-    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"আপুনি <xliff:g id="NAME">^1</xliff:g>লৈ ফাইল, মিডিয়া আৰু কিছুমান নিৰ্দিষ্ট এপ্ স্থানান্তৰ কৰিব পাৰে। \n\nএই কাৰ্যই আপোনাৰ ফ\'নৰ সঞ্চয়াগাৰত <xliff:g id="SIZE">^2</xliff:g> ঠাই মুকলি কৰিব আৰু এই কাম কৰোঁতে প্ৰায় <xliff:g id="DURATION">^3</xliff:g> লাগিব।"</string>
+    <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4541523202790415721">"আপুনি <xliff:g id="NAME">^1</xliff:g>লৈ ফাইল, মিডিয়া আৰু কিছুমান নিৰ্দিষ্ট এপ্ স্থানান্তৰ কৰিব পাৰে। \n\nএই কাৰ্যই আপোনাৰ টেবলেটৰ ষ্ট’ৰেজত <xliff:g id="SIZE">^2</xliff:g> ঠাই মুকলি কৰিব আৰু এই কাম কৰোঁতে প্ৰায় <xliff:g id="DURATION">^3</xliff:g> লাগিব।"</string>
+    <string name="storage_wizard_migrate_v2_body" product="default" msgid="809730501314645325">"আপুনি <xliff:g id="NAME">^1</xliff:g>লৈ ফাইল, মিডিয়া আৰু কিছুমান নিৰ্দিষ্ট এপ্ স্থানান্তৰ কৰিব পাৰে। \n\nএই কাৰ্যই আপোনাৰ ফ’নৰ ষ্ট’ৰেজত <xliff:g id="SIZE">^2</xliff:g> ঠাই মুকলি কৰিব আৰু এই কাম কৰোঁতে প্ৰায় <xliff:g id="DURATION">^3</xliff:g> লাগিব।"</string>
     <string name="storage_wizard_migrate_v2_checklist" msgid="2618258869444553060">"স্থানান্তৰণৰ সময়ত:"</string>
     <string name="storage_wizard_migrate_v2_checklist_media" msgid="5867134681730723744">"<xliff:g id="NAME">^1</xliff:g> স্থানান্তৰ নকৰিব"</string>
     <string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"কিছুমান এপে কাম নকৰিব"</string>
@@ -1679,7 +1683,7 @@
     <string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"সমল পিছত স্থানান্তৰ কৰক"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"সমল স্থানান্তৰ কৰি থকা হৈছে…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"লেহেমীয়া <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"আপুনি তথাপি <xliff:g id="NAME_0">^1</xliff:g> ব্যৱহাৰ কৰি থাকিব পাৰে, কিন্তু ই লেহেমীয়া হ\'ব পাৰে। \n\n<xliff:g id="NAME_1">^2</xliff:g>ত জমা কৰি ৰখা এপসমূহে সঠিকভাৱে কাম নকৰিব পাৰে, আৰু সমলৰ স্থানান্তৰ কৰোঁতে বহুত সময় লাগিব পাৰে। \n\nএটা দ্ৰুত <xliff:g id="NAME_2">^3</xliff:g> ব্যৱহাৰ কৰি চাওক, বা তাৰ সলনি <xliff:g id="NAME_3">^4</xliff:g>ক প\'ৰ্টেবল সঞ্চয়াগাৰ হিচাপে ব্যৱহাৰ কৰক।"</string>
+    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"আপুনি তথাপি <xliff:g id="NAME_0">^1</xliff:g> ব্যৱহাৰ কৰি থাকিব পাৰে, কিন্তু ই লেহেমীয়া হ’ব পাৰে। \n\n<xliff:g id="NAME_1">^2</xliff:g>ত ষ্ট’ৰ কৰি ৰখা এপ্‌সমূহে সঠিকভাৱে কাম নকৰিব পাৰে আৰু সমল স্থানান্তৰ কৰোঁতে বহুত সময় লাগিব পাৰে। \n\nএটা দ্ৰুত <xliff:g id="NAME_2">^3</xliff:g> ব্যৱহাৰ কৰি চাওক বা তাৰ সলনি <xliff:g id="NAME_3">^4</xliff:g>ক প’ৰ্টেবল ষ্ট’ৰেজ হিচাপে ব্যৱহাৰ কৰক।"</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"আকৌ আৰম্ভ কৰক"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"অব্যাহত ৰাখক"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"আপুনি সমলক <xliff:g id="NAME">^1</xliff:g>লৈ স্থানান্তৰ কৰিব পাৰে"</string>
@@ -1734,23 +1738,23 @@
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"নেটৱৰ্ক, এপ্ বা ডিভাইচ ৰিছেট কৰিব পৰা যায়"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"এপ্‌সমূহ ৰিছেট কৰিব পাৰি"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ৱাই-ফাই, ম’বাইল আৰু ব্লুটুথ ৰিছেট কৰক"</string>
-    <string name="reset_network_desc" msgid="1112523764899788246">"ই :\n\n"<li>"ৱাই-ফাই"</li>\n<li>"ম\'বাইল ডেটা"</li>\n<li>"ব্লুটুথ"</li>"কে আদি কৰি সকলো নেটৱৰ্ক ছেটিং ৰিছেট কৰিব"</string>
+    <string name="reset_network_desc" msgid="1112523764899788246">"ই :\n\n"<li>"ৱাই-ফাই"</li>\n<li>"ম\'বাইল ডেটা"</li>\n<li>"ব্লুটুথ"</li>"কে আদি কৰি আটাইবোৰ নেটৱৰ্ক ছেটিং ৰিছেট কৰিব"</string>
     <string name="erase_euicc_data_button" msgid="728078969563311737">"মচক"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ডাউনল’ড কৰা ছিমবোৰ মচক"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"ই কোনো ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে। সলনি কৰা ছিম ডাউনল’ড কৰিবলৈ আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ছেটিং ৰিছেট কৰক"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"নেটৱৰ্কৰ আটাইবোৰ ছেটিং ৰিছেট কৰিবনে? আপুনি এই কাৰ্যটো আনডু কৰিব নোৱাৰিব।"</string>
-    <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"সকলো নেটৱৰ্ক ছেটিং ৰিছেট কৰিবনে আৰু সকলো ডাউনল’ড কৰা ছিম মচিবনে? আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
+    <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"আটাইবোৰ নেটৱৰ্ক ছেটিং ৰিছেট কৰিবনে আৰু আটাইবোৰ ডাউনল’ড কৰা ছিম মচিবনে? আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
     <string name="reset_network_final_button_text" msgid="2433867118414000462">"ছেটিং ৰিছেট কৰক"</string>
     <string name="reset_network_confirm_title" msgid="913014422184481270">"ৰিছেট কৰিবনে?"</string>
     <string name="network_reset_not_available" msgid="1966334631394607829">"এই ব্যৱহাৰকাৰীৰ বাবে নেটৱৰ্ক ৰিছেট উপলব্ধ নহয়"</string>
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"নেটৱৰ্ক ছেটিং ৰিছেট কৰা হ’ল"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ছিমবোৰ আঁতৰাব পৰা নগ’ল"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ডাউনল’ড কৰা ছিমটো কোনো অজ্ঞাত আঁসোৱাহৰ বাবে মচিব পৰা নগ’ল।\n\nআপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰি আকৌ চেষ্টা কৰক।"</string>
-    <string name="main_clear_title" msgid="277664302144837723">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="main_clear_short_title" msgid="4752094765533020696">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
-    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"আটাইবোৰ ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"আটাইবোৰ ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা আটাইবোৰ ডেটা মচিব"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা আটাইবোৰ ডেটা মচিব"</string>
     <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
     <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"এই ডিভাইচত আৰু ব্যৱহাৰকাৰী আছে।\n"</string>
     <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"সংগীত"</li>\n<li>"ফট’"</li>\n<li>"অন্য ব্যৱহাৰকাৰীৰ ডেটা"</li></string>
@@ -1758,15 +1762,15 @@
     <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"এইটোৱে আপোনাৰ ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে।"</string>
     <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"USB ষ্ট’ৰেজ"</b>" মচিব লাগিব।"</string>
     <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"এছডি কাৰ্ডখন"</b>" মচিব লাগিব।"</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ইউএছবি সঞ্চয়াগাৰ মচক"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ইউএছবি ষ্ট’ৰেজ মচক"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD কাৰ্ড মচক"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"সংগীত, ফট\' আদিকে ধৰি আভ্যন্তৰিণ USB সঞ্চয়াগাৰত থকা সকলো ডেটা মচক"</string>
-    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"সংগীত বা ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা সকলো ডেটা মচক"</string>
-    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
-    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
-    <string name="main_clear_final_desc" msgid="5800877928569039580">"আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্‌ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
-    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনল’ড কৰা এপ্‌সমূহ আৰু ছিমকে ধৰি আপোনাৰ সকলো ব্যক্তিগত তথ্য মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
-    <string name="main_clear_confirm_title" msgid="6577071819657853713">"সকলো ডেটা মচিবনে?"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"সংগীত, ফট’ আদিকে ধৰি আভ্যন্তৰীণ ইউএছবি ষ্ট’ৰেজত থকা আটাইখিনি ডেটা মচক"</string>
+    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"সংগীত বা ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা আটাইবোৰ ডেটা মচক"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"আটাইবোৰ ডেটা মচক"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"আটাইবোৰ ডেটা মচক"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"আপোনাৰ আটাইবোৰ ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্‌ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনল’ড কৰা এপ্‌সমূহ আৰু ছিমকে ধৰি আপোনাৰ আটাইবোৰ ব্যক্তিগত তথ্য মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"আটাইবোৰ ডেটা মচিবনে?"</string>
     <string name="main_clear_not_available" msgid="3433795327146684827">"এই ব্যৱহাৰকাৰীগৰাকীৰ বাবে ফেক্টৰী ৰিছেট সুবিধাটো উপলব্ধ নহয়"</string>
     <string name="main_clear_progress_title" msgid="7239741132015617719">"মচি থকা হৈছে"</string>
     <string name="main_clear_progress_text" msgid="4636695115176327972">"অনুগ্ৰহ কৰি অপেক্ষা কৰক…"</string>
@@ -1837,7 +1841,7 @@
     <string name="mobile_insert_sim_card" msgid="3639245241283948038">"অনুগ্ৰহ কৰি ছিম কাৰ্ড সুমুৱাওক আৰু ৰিষ্টাৰ্ট কৰক"</string>
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"অনুগ্ৰহ কৰি ইণ্টানেটত সংযোগ কৰক"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"শেহতীয়া অৱস্থানৰ অনুৰোধ"</string>
-    <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"সকলো চাওক"</string>
+    <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"আটাইবোৰ চাওক"</string>
     <string name="location_category_location_services" msgid="8163798686832434284">"অৱস্থান সেৱাসমূহ"</string>
     <string name="location_title" msgid="5819154746934945021">"মোৰ অৱস্থান"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ বাবে অৱস্থান"</string>
@@ -2017,7 +2021,7 @@
     <string name="applications_settings_summary" msgid="8206066893744768531">"এপ্ প্ৰৱন্ধন কৰক, ক্ষিপ্ৰতাৰে আৰম্ভ কৰা শ্ৱৰ্টকাট ছেটআপ কৰক"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"এপ্ ছেটিং"</string>
     <string name="install_applications" msgid="3921609656584369901">"অজ্ঞাত উৎসবোৰ"</string>
-    <string name="install_applications_title" msgid="7890233747559108106">"সকলো এপৰ উৎসক অনুমতি দিয়ক"</string>
+    <string name="install_applications_title" msgid="7890233747559108106">"আটাইবোৰ এপৰ উৎসক অনুমতি দিয়ক"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"অলপতে খোলা এপসমূহ"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
       <item quantity="one">সম্পূৰ্ণ %1$dটা এপ্‌ চাওক</item>
@@ -2031,7 +2035,7 @@
     <string name="advanced_settings" msgid="2368905204839169094">"উচ্চখাপৰ ছেটিং"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"ছেটিঙৰ অধিক বিকল্প সক্ষম কৰক"</string>
     <string name="application_info_label" msgid="1015706497694165866">"এপ-সম্পৰ্কীয় তথ্য"</string>
-    <string name="storage_label" msgid="2522307545547515733">"সঞ্চয়াগাৰ"</string>
+    <string name="storage_label" msgid="2522307545547515733">"ষ্ট’ৰেজ"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"ডিফ’ল্ট অনুযায়ী খোলক"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"ডিফ’ল্টসমূহ"</string>
     <string name="screen_compatibility_label" msgid="7549658546078613431">"স্ক্ৰীনৰ সুসংগতি"</string>
@@ -2048,16 +2052,16 @@
     <string name="force_stop" msgid="2681771622136916280">"বলেৰে ৰখাওক"</string>
     <string name="total_size_label" msgid="2052185048749658866">"মুঠ"</string>
     <string name="application_size_label" msgid="6407051020651716729">"এপৰ আকাৰ"</string>
-    <string name="external_code_size_label" msgid="7375146402660973743">"USB সঞ্চয়াগাৰ এপ্"</string>
+    <string name="external_code_size_label" msgid="7375146402660973743">"ইউএছবি ষ্ট’ৰেজ এপ্"</string>
     <string name="data_size_label" msgid="7814478940141255234">"ব্যৱহাৰকাৰীৰ ডেটা"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="1054860423004751290">"ইউএছবি সঞ্চয়াগাৰৰ ডেটা"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="1054860423004751290">"ইউএছবি ষ্ট’ৰেজৰ ডেটা"</string>
     <string name="external_data_size_label" product="default" msgid="3370825186202856353">"এছডি কাৰ্ড"</string>
     <string name="uninstall_text" msgid="315764653029060126">"আনইনষ্টল কৰক"</string>
-    <string name="uninstall_all_users_text" msgid="5924715251087176474">"সকলো ব্যৱহাৰকাৰীৰ বাবে আনইনষ্টল কৰক"</string>
+    <string name="uninstall_all_users_text" msgid="5924715251087176474">"আটাইবোৰ ব্যৱহাৰকাৰীৰ বাবে আনইনষ্টল কৰক"</string>
     <string name="install_text" msgid="4558333621516996473">"ইনষ্টল কৰক"</string>
     <string name="disable_text" msgid="5146002260857428005">"নিষ্ক্ৰিয় কৰক"</string>
     <string name="enable_text" msgid="8570798764647110430">"সক্ষম কৰক"</string>
-    <string name="clear_user_data_text" msgid="6773186434260397947">"সঞ্চয়াগাৰ মচক"</string>
+    <string name="clear_user_data_text" msgid="6773186434260397947">"ষ্ট’ৰেজ মচক"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"আপডেইটবিলাক আঁতৰাওক"</string>
     <string name="auto_launch_enable_text" msgid="8912714475823807798">"আপুনি বাছনি কৰা কিছুমান কাৰ্যকলাপ ডিফ’ল্ট হিচাপে এই এপ্‌টোত খোল খায়।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"আপুনি এই এপটোক ৱিজেট সৃষ্টি কৰিবলৈ আৰু সেইবিলাকৰ ডেটা চাবলৈ অনুমতি দিবলৈ বাছনি কৰিছে।"</string>
@@ -2076,12 +2080,12 @@
     <string name="default_emergency_app" msgid="1929974800666613803">"জৰুৰীকালীন এপ্"</string>
     <string name="reset_app_preferences" msgid="8861758340732716573">"এপৰ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰক"</string>
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"এপৰ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰিবনে?"</string>
-    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"ই এইসমূহৰ সকলো অগ্ৰাধিকাৰ ৰিছেট কৰিব:\n\n"<li>"অক্ষম কৰি থোৱা এপ্"</li>\n<li>"অক্ষম কৰি থোৱা এপ্ জাননী"</li>\n<li>"কাৰ্যৰ ডিফ’ল্ট এপ্লিকেশ্বন"</li>\n<li>"এপৰ নেপথ্য ডেটা সীমাবদ্ধকৰণ"</li>\n<li>"যিকোনো অনুমতিৰ সীমাবদ্ধকৰণ"</li>\n\n"আপুনি কোনো এপৰ ডেটা নেহেৰুৱায়।"</string>
+    <string name="reset_app_preferences_desc" msgid="6509978724602405805">"ই এইসমূহৰ আটাইবোৰ অগ্ৰাধিকাৰ ৰিছেট কৰিব:\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="2591318711372850058">"এপ্ ৰিছেট কৰক"</string>
     <string name="manage_space_text" msgid="9013414693633572277">"ঠাই পৰিচালনা কৰক"</string>
     <string name="filter" msgid="9039576690686251462">"ফিল্টাৰ"</string>
     <string name="filter_dlg_title" msgid="3086282431958601338">"ফিল্টাৰ বিকল্পসমূহ বাছনি কৰক"</string>
-    <string name="filter_apps_all" msgid="5705421199299914620">"সকলো এপ্"</string>
+    <string name="filter_apps_all" msgid="5705421199299914620">"আটাইবোৰ এপ্"</string>
     <string name="filter_apps_disabled" msgid="5068011814871004105">"নিষ্ক্ৰিয় এপসমূহ"</string>
     <string name="filter_apps_third_party" msgid="9049447784849114843">"ডাউনল’ড কৰা হোৱা"</string>
     <string name="filter_apps_running" msgid="535465683273284141">"চলি আছে"</string>
@@ -2090,15 +2094,15 @@
     <string name="not_installed" msgid="5074606858798519449">"এই ব্যৱহাৰকাৰীজনৰ বাবে ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="installed" msgid="2837449358488825884">"ইনষ্টল হ’ল"</string>
     <string name="no_applications" msgid="985069304755391640">"কোনো এপ্‌ নাই।"</string>
-    <string name="internal_storage" msgid="999496851424448809">"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</string>
+    <string name="internal_storage" msgid="999496851424448809">"আভ্যন্তৰীণ ষ্ট’ৰেজ"</string>
     <string name="recompute_size" msgid="1098091228370999128">"এপৰ আকাৰ পুনঃগণনা কৰা হৈছে…"</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"এপ্ ডেটা মচিবনে?"</string>
-    <string name="clear_data_dlg_text" msgid="1107610960337399006">"এই এপৰ ডেটাখিনি স্থায়ীভাৱে মচা হ’ব। ইয়াত ফাইল, ছেটিং, ডেটাবে’ছ আৰু অন্য এপৰ ডেটা অন্তৰ্ভুক্ত।"</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"এই এপ্‌টোৰ আটাইবোৰ ডেটা স্থায়ীভাৱে মচা হ\'ব। সেই ডেটাসমূহৰ ভিতৰত ফাইল ছেটিং, একাউণ্ট, ডেটাবে\'ছ আদি অন্তৰ্ভুক্ত।"</string>
     <string name="dlg_ok" msgid="1421350367857960997">"ঠিক"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"বাতিল কৰক"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
     <string name="app_not_found_dlg_text" msgid="8634675268730513704">"ইনষ্টলহৈ থকা এপৰ তালিকাত এপটো পোৱা নগ\'ল।"</string>
-    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"এপৰ সঞ্চয়াগাৰ মচিব পৰা নগ\'ল৷"</string>
+    <string name="clear_failed_dlg_text" msgid="6866741916836125732">"এপৰ ষ্ট’ৰেজ মচিব পৰা নগ\'ল।"</string>
     <string name="join_two_items" msgid="7893073836681382429">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> আৰু <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="5301233410730513655">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="computing_size" msgid="4915310659841174866">"গণনা কৰি থকা হৈছে…"</string>
@@ -2110,7 +2114,7 @@
     <string name="move_app_to_sdcard" product="nosdcard" msgid="1145367822171576972">"ইউএছবি ষ্ট’ৰেজলৈ স্থানান্তৰ কৰক"</string>
     <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"এছডি কাৰ্ডলৈ স্থানান্তৰ কৰক"</string>
     <string name="another_migration_already_in_progress" msgid="6550546307856052261">"অন্য এটা স্থানান্তৰণ কাৰ্য ইতিমধ্যে চলি আছে৷"</string>
-    <string name="insufficient_storage" msgid="8115088042669030558">"সঞ্চয়াগাৰত পৰ্যাপ্ত খালী ঠাই নাই।"</string>
+    <string name="insufficient_storage" msgid="8115088042669030558">"ষ্ট’ৰেজত পৰ্যাপ্ত খালী ঠাই নাই।"</string>
     <string name="does_not_exist" msgid="6499163879348776120">"এপটোৰ অস্তিত্ব নাই"</string>
     <string name="invalid_location" msgid="8013853455355520557">"ইনষ্টল কৰা অৱস্থান মান্য নহয়৷"</string>
     <string name="system_package" msgid="7559476279008519360">"বাহ্যিক মিডিয়াত ছিষ্টেমৰ আপডেইটসমূহ ইনষ্টল কৰিব নোৱাৰি৷"</string>
@@ -2129,7 +2133,7 @@
     <string name="app_ops_running" msgid="6127474473137428721">"চলি আছে"</string>
     <string name="app_ops_never_used" msgid="9038133162371204506">"(পূৰ্বতে অব্যৱহৃত)"</string>
     <string name="no_default_apps" msgid="8966319676910104570">"কোনো ডিফ\'ল্ট এপ্ নাই"</string>
-    <string name="storageuse_settings_title" msgid="3125650750657988194">"সঞ্চয়াগাৰৰ ব্যৱহাৰ"</string>
+    <string name="storageuse_settings_title" msgid="3125650750657988194">"ষ্ট’ৰেজৰ ব্যৱহাৰ"</string>
     <string name="storageuse_settings_summary" msgid="5001621552305431831">"এপ্‌সমূহে ষ্ট’ৰেজত অধিকাৰ কৰা ঠাই চাওক"</string>
     <string name="service_restarting" msgid="5104563288155809226">"ৰিষ্টাৰ্ট কৰা হৈছে"</string>
     <string name="cached" msgid="5379485147573438201">"কেশ্ব কৰা হোৱা নেপথ্য কাৰ্যপ্ৰণালী"</string>
@@ -2192,7 +2196,7 @@
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"\"।\" দিবলৈ স্পেচ কীটো দুবাৰ হেঁচক"</string>
     <string name="show_password" msgid="7101900779571040117">"পাছৱৰ্ডবোৰ দেখুৱাওক"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"আপুনি টাইপ কৰাৰ লগে লগে বৰ্ণসমূহ খন্তেকৰ বাবে দেখুৱাওক"</string>
-    <string name="spellchecker_security_warning" msgid="2016059050608271820">"এই বানান পৰীক্ষকটোৱে আপুনি টাইপ কৰা আপোনাৰ ব্যক্তিগত ডেটা যেনে পাছৱৰ্ডসমূহ আৰু ক্ৰেডিট কাৰ্ডৰ নম্বৰসূহকে ধৰি সকলো পাঠ সংগ্ৰহ কৰিবলৈ সক্ষম হ\'ব পাৰে। <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> এপটোৰ লগত ই সংলগ্ন। এই বানান পৰীক্ষকটো ব্যৱহাৰ কৰে নে?"</string>
+    <string name="spellchecker_security_warning" msgid="2016059050608271820">"এই বানান পৰীক্ষকটোৱে আপুনি টাইপ কৰা আপোনাৰ ব্যক্তিগত ডেটা যেনে পাছৱৰ্ডসমূহ আৰু ক্ৰেডিট কাৰ্ডৰ নম্বৰসূহকে ধৰি আটাইবোৰ পাঠ সংগ্ৰহ কৰিবলৈ সক্ষম হ\'ব পাৰে। <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> এপ্‌টোৰ লগত ই সংলগ্ন। এই বানান পৰীক্ষকটো ব্যৱহাৰ কৰিবনে?"</string>
     <string name="spellchecker_quick_settings" msgid="6449414356743946577">"ছেটিং"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"ভাষা"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"কীব\'র্ড"</string>
@@ -2236,7 +2240,7 @@
     <string name="user_dict_settings_context_menu_edit_title" msgid="4909198741914531509">"সম্পাদনা কৰক"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="651550824433043545">"মচক"</string>
     <string name="user_dict_settings_empty_text" msgid="86562873609647919">"ব্যৱহাৰকাৰীৰ অভিধানত এটাও শব্দ নাই। শব্দ যোগ কৰিবলৈ (+) বুটামটো টিপক।"</string>
-    <string name="user_dict_settings_all_languages" msgid="8563387437755363526">"সকলো ভাষাৰ বাবে"</string>
+    <string name="user_dict_settings_all_languages" msgid="8563387437755363526">"আটাইবোৰ ভাষাৰ বাবে"</string>
     <string name="user_dict_settings_more_languages" msgid="5378870726809672319">"অধিক ভাষা…"</string>
     <string name="testing" msgid="6294172343766732037">"পৰীক্ষা কৰি থকা হৈছে"</string>
     <string name="testing_phone_info" product="tablet" msgid="1910768200608214456">"টে\'বলেট সম্পৰ্কীয় তথ্য"</string>
@@ -2393,7 +2397,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"স্পৰ্শ কৰি হেঁচি ধৰি থকাৰ সময়"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"ৰং বিপৰীতকৰণ"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"ৰং বিপৰীতকৰণ ব্যৱহাৰ কৰক"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ৰং বিপৰীতকৰণে পাতল ৰঙৰ স্ক্ৰীনসমূহ গাঢ় কৰি তোলে।&lt;br/&gt;&lt;br/&gt;টোকা: &lt;ol&gt; &lt;li&gt; ৰং বিপৰীতকৰণে গাঢ় স্ক্ৰীনসমূহো পাতল ৰঙৰ কৰে।&lt;/li&gt; &lt;li&gt; মিডিয়া আৰু প্ৰতিচ্ছবিসমূহত ৰংবোৰ সলনি হ’ব।&lt;/li&gt; &lt;li&gt; কোনো গাঢ় ৰঙৰ পটভূমি প্ৰদর্শন কৰিবলৈ গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰিব পৰা যায়। গাঢ় ৰঙৰ থীমে সমর্থিত এপ্‌সমূহৰ সৈতে কাম কৰে। ৰং বিপৰীতকৰণে সকলো এপৰ সৈতে কাম কৰে।&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ৰং বিপৰীতকৰণে পাতল ৰঙৰ স্ক্ৰীনসমূহ গাঢ় কৰি তোলে।&lt;br/&gt;&lt;br/&gt;টোকা: &lt;ol&gt; &lt;li&gt; ৰং বিপৰীতকৰণে গাঢ় স্ক্ৰীনসমূহো পাতল ৰঙৰ কৰে।&lt;/li&gt; &lt;li&gt; মিডিয়া আৰু প্ৰতিচ্ছবিসমূহত ৰংবোৰ সলনি হ’ব।&lt;/li&gt; &lt;li&gt; কোনো গাঢ় ৰঙৰ পটভূমি প্ৰদর্শন কৰিবলৈ গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰিব পৰা যায়। গাঢ় ৰঙৰ থীমে সমর্থিত এপ্‌সমূহৰ সৈতে কাম কৰে। ৰং বিপৰীতকৰণে আটাইবোৰ এপৰ সৈতে কাম কৰে।&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"স্বয়ংক্ৰিয় (কোনো বস্তুত কাৰ্ছাৰ ৰখা সময়)"</string>
     <string name="accessibility_autoclick_description" msgid="6827042379062255307">"স্বয়ংক্ৰিয় ক্লিক সুবিধাটোৱে এটা মাউছ সংযুক্ত হৈ থকিলে কাম কৰে। কাৰ্ছাৰডাল এটা নিশ্চিত সময়লৈকে লৰচৰ নকৰাকৈ থাকিলে আপুনি মাউছৰ কাৰ্ছাৰডালক স্বয়ংক্ৰিয়ভাৱে ক্লিক কৰিবলৈ ছেট কৰিব পাৰে।"</string>
     <string name="accessibility_autoclick_default_title" msgid="752429113115293087">"অফ আছে"</string>
@@ -2419,7 +2423,7 @@
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"কেপশ্বনৰ আকাৰ আৰু শৈলী"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> আকাৰৰ পাঠ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"অধিক বিকল্প"</string>
-    <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"সকলোবোৰ এপে এই কেপশ্বন অগ্ৰাধিকাৰসমূহ সমৰ্থন নকৰে"</string>
+    <string name="accessibility_caption_preference_summary" msgid="1191356970836416954">"আটাইবোৰ এপে এই কেপশ্বন অগ্ৰাধিকাৰসমূহ সমৰ্থন নকৰে"</string>
     <string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"সাধ্য সুবিধাৰ বুটাম"</string>
     <string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"একেবাৰে তলৰ পৰা ২ টা আঙুলিৰে ওপৰলৈ ছোৱাইপ কৰা"</string>
     <string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"ভলিউম কীসমূহ ধৰি ৰখা"</string>
@@ -2530,7 +2534,7 @@
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>এ এই ডিভাইচটোৰ সম্পূৰ্ণ নিয়ন্ত্ৰণ বিচাৰিছে। এই সেৱাটোৱে স্ক্ৰীন পঢ়িব পাৰে আৰু ব্যৱহাৰকাৰীৰ হৈ সাধ্য সুবিধাৰ প্ৰয়োজন অনুসৰি কাম কৰিব পাৰে। বেছিভাগ এপৰ ক্ষেত্ৰত এই নিয়ন্ত্ৰণৰ স্তৰ সঠিক নহয়।"</string>
     <string name="accessibility_service_warning_description" msgid="6573203795976134751">"আপোনাক সাধ্য সুবিধাৰ প্ৰয়োজনসমূহৰ জৰিয়তে সহায় কৰা এপ্‌সমূহৰ বাবে সম্পূর্ণ নিয়ন্ত্ৰণৰ সুবিধাটো সঠিক যদিও অধিকাংশ এপৰ বাবে এয়া সঠিক নহয়।"</string>
     <string name="accessibility_service_screen_control_title" msgid="324795030658109870">"চাওক আৰু স্ক্ৰীন নিয়ন্ত্ৰণ কৰক"</string>
-    <string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"ই স্ক্ৰীনৰ সকলো সমল পঢ়িব পাৰে আৰু অন্য এপ্‌সমূহৰ ওপৰত সমল প্ৰদর্শন কৰিব পাৰে।"</string>
+    <string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"ই স্ক্ৰীনৰ আটাইবোৰ সমল পঢ়িব পাৰে আৰু অন্য এপ্‌সমূহৰ ওপৰত সমল প্ৰদর্শন কৰিব পাৰে।"</string>
     <string name="accessibility_service_action_perform_title" msgid="1449360056585337833">"কার্যসমূহ চাওক আৰু কৰক"</string>
     <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"ই আপুনি কোনো এপ্ বা হার্ডৱেৰ ছেন্সৰৰ সৈতে কৰা ভাব-বিনিময় আৰু আপোনাৰ হৈ অন্য কোনো লোকে এপৰ সৈতে কৰা ভাব-বিনিময় ট্ৰেক কৰিব পাৰে।"</string>
     <string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"অনুমতি দিয়ক"</string>
@@ -2874,7 +2878,7 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"স্বয়ংক্ৰিয়ভাবে অন কৰক"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"কেতিয়াও নকৰিব"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"<xliff:g id="PERCENT">%1$s</xliff:g> বেটাৰী"</string>
-    <string name="battery_percentage" msgid="1779934245963043490">"বেটাৰীত থকা চ্চাৰ্জৰ শতাংশ"</string>
+    <string name="battery_percentage" msgid="1779934245963043490">"বেটাৰীত থকা চাৰ্জৰ শতাংশ"</string>
     <string name="battery_percentage_description" msgid="2321465139126125541">"স্থিতি বাৰত বেটাৰীৰ চাৰ্জৰ শতকৰা হাৰ দেখুৱাওক"</string>
     <string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"যোৱা ২৪ ঘণ্টাৰ বেটাৰীৰ স্তৰ"</string>
     <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"যোৱা ২৪ ঘণ্টাত হোৱা এপৰ ব্যৱহাৰ"</string>
@@ -2950,12 +2954,12 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"আপোনাৰ নেটৱৰ্কৰ সংযোগসমূহ স্বয়ংক্ৰিয়ভাৱে পৰিচালনা কৰি বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰে আৰু ডিভাইচৰ কাৰ্যক্ষমতা উন্নত কৰে"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"অন কৰক"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"অফ কৰক"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰ"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"এখন প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ষ্ট’ৰেজৰ পৰা প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"এছডি কাৰ্ডৰ পৰা প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"ক্ৰেডেনশ্বিয়েল গুচাওক"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"সকলো প্ৰমাণপত্ৰ আঁতৰাওক"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"আটাইবোৰ প্ৰমাণপত্ৰ আঁতৰাওক"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"বিশ্বাসী ক্ৰেডেনশ্বিয়েলসমূহ"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"বিশ্বাসী চিএ প্ৰমাণপত্ৰসমূহ দেখুৱাওক"</string>
     <string name="user_credentials" msgid="4044405430790970775">"ব্যৱহাৰকাৰীৰ ক্ৰেডেনশ্বিয়েল"</string>
@@ -2964,7 +2968,7 @@
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যৱহাৰকাৰীৰ বাবে ক্ৰেডেনশ্বিয়েলসমূহ উপলব্ধ নহয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ভিপিএন আৰু এপ্‌সমূহৰ বাবে ইনষ্টল কৰা হৈছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ৱাই-ফাইৰ বাবে ইনষ্টল কৰা হৈছে"</string>
-    <string name="credentials_reset_hint" msgid="4054601857203464867">"সকলো সমল আঁতৰাবনে?"</string>
+    <string name="credentials_reset_hint" msgid="4054601857203464867">"আটাইবোৰ সমল আঁতৰাবনে?"</string>
     <string name="credentials_erased" msgid="9121052044566053345">"ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজ মচা হ’ল।"</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজ মচিব নোৱাৰি।"</string>
     <string name="usage_access_title" msgid="1580006124578134850">"ব্যৱহাৰ কৰাৰ সুবিধা পোৱা এপবোৰ"</string>
@@ -3010,7 +3014,7 @@
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"সাম্প্ৰতিকভাৱে কোনো একাউণ্টে বেকাআপ কৰা ডেটা সঞ্চয় কৰা নাই"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"আপোনাৰ ৱাই-ফাই পাছৱৰ্ড, বুকমাৰ্ক, অন্য ছেটিং আৰু এপ্ ডেটাৰ বেকআপ বন্ধ কৰাৰ লগতে Google ছাৰ্ভাৰত প্ৰতিলিপি কৰা আটাইবোৰ বস্তু মচিবনে?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ডিভাইচ ডেটাৰ বেকআপ (যেনে ৱাই-ফাই পাছৱৰ্ড আৰু কল ইতিহাস) আৰু এপ ডেটা (ছেটিং আৰু এপ্‌সমূহৰ দ্বাৰা সংগ্ৰহ কৰি ৰখা ফাইলসমূহ), লগতে ৰিম\'ট ছাৰ্ভাৰসমূহত থকা সকলো প্ৰতিলিপি মচা বন্ধ কৰিব নেকি?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ডিভাইচ ডেটাৰ বেকআপ (যেনে ৱাই-ফাই পাছৱৰ্ড আৰু কল ইতিহাস) আৰু এপ্‌ ডেটা (ছেটিং আৰু এপ্‌সমূহৰ দ্বাৰা সংগ্ৰহ কৰি ৰখা ফাইলসমূহ), লগতে ৰিম\'ট ছাৰ্ভাৰসমূহত থকা আটাইবোৰ প্ৰতিলিপি মচা বন্ধ কৰিব নেকি?"</string>
     <string name="fullbackup_data_summary" msgid="971587401251601473">"আপোনাৰ ডিভাইচৰ ডেটা (যেনে, ৱাই-ফাইৰ পাছৱৰ্ড আৰু কলৰ ইতিহাস) আৰু এপৰ ডেটা (যেনে, ছেটিং আৰু এপে জমা কৰা ফাইলসমূহ)ৰ নিলগৰ পৰা বেকআপ লওক।\n\nযেতিয়া আপুনি স্বয়ংক্ৰিয় বেকআপ অন কৰে, তেতিয়া ডিভাইচ আৰু এপৰ ডেটা সময়ে সময়ে নিলগৰ পৰা ছেভ কৰা হয়। এপ্‌ ডেটা যিকোনো এপে (ডেভেলপাৰ ছেটিং অনুসৰি) জমা কৰা ডেটা হ\'ব পাৰে, য\'ত সম্ভাব্য সংবেদনশীল ডেটা যেনে সম্পৰ্ক, বাৰ্তা আৰু ফট\' আদিসমূহ অন্তৰ্ভুক্ত হ\'ব পাৰে।"</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"ডিভাইচ এডমিন ছেটিং"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"ডিভাইচ প্ৰশাসকৰ এপ্‌"</string>
@@ -3083,9 +3087,9 @@
     <string name="remove_account_label" msgid="4169490568375358010">"একাউণ্ট আঁতৰাওক"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"একাউণ্ট যোগ কৰক"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"একাউণ্ট আঁতৰাবনে?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"এই একাউণ্টটো আঁতৰালে টে\'বলেটৰ পৰা ইয়াৰ সকলো বাৰ্তা, সম্পৰ্কসূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"এই একাউণ্টটো আঁতৰালে ফ\'নৰ পৰা ইয়াৰ সকলো বাৰ্তা, সম্পৰ্ক সূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"এই একাউণ্টটো আঁতৰালে ডিভাইচটোৰ পৰা ইয়াৰ সকলো বাৰ্তা, সম্পৰ্কসূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"এই একাউণ্টটো আঁতৰালে টে\'বলেটৰ পৰা ইয়াৰ আটাইবোৰ বাৰ্তা, সম্পৰ্কসূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"এই একাউণ্টটো আঁতৰালে ফ\'নৰ পৰা ইয়াৰ আটাইবোৰ বাৰ্তা, সম্পৰ্ক সূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"এই একাউণ্টটো আঁতৰালে ডিভাইচটোৰ পৰা ইয়াৰ আটাইবোৰ বাৰ্তা, সম্পৰ্কসূচী আৰু অন্য ডেটা মচা হ\'ব!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"আপোনাৰ প্ৰশাসকে এইটো সলনি কৰিবলৈ অনুমতি নিদিয়ে"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"মেনুৱেলী ছিংক কৰিব পৰা নগ\'ল"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"এই বস্তুটোৰ বাবে ছিংক বৰ্তমান নিষ্ক্ৰিয় হৈ আছে। সেই ছেটিংটো সলনি কৰিবলৈ সাময়িকভাৱে নেপথ্য ডেটা আৰু স্বয়ংক্ৰিয় ছিংক সক্ৰিয় কৰক।"</string>
@@ -3101,7 +3105,7 @@
     <string name="misc_files" msgid="6598066985800749585">"বিভিন্ন ফাইল"</string>
     <string name="misc_files_selected_count" msgid="5597802791672749532">"<xliff:g id="TOTAL">%2$d</xliff:g>ৰ ভিতৰত <xliff:g id="NUMBER">%1$d</xliff:g> বাছনি কৰা হ’ল"</string>
     <string name="misc_files_selected_count_bytes" msgid="7622766714974500289">"<xliff:g id="TOTAL">%2$s</xliff:g>ৰ ভিতৰত <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="select_all" msgid="7898929601615536401">"সকলো বাছনি কৰক"</string>
+    <string name="select_all" msgid="7898929601615536401">"আটাইবোৰ বাছনি কৰক"</string>
     <string name="data_usage_summary_title" msgid="394067070764360142">"ডেটাৰ ব্যৱহাৰ"</string>
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"ম’বাইল ডেটা আৰু ৱাই-ফাই"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"বাহকৰ ডেটা গণনা কাৰ্য আপোনাৰ ডিভাইচতকৈ পৃথক হ’ব পাৰে৷"</string>
@@ -3330,16 +3334,16 @@
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"কৰ্মস্থানৰ প্ৰ\'ফাইল আঁতহৰাইনে?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"আপুনি এই টেবলেটত আপোনাৰ বাবে সংৰক্ষিত ঠাই আৰু ডেটা হেৰুৱাব। আপুনি এই কাৰ্য পিছত শুধৰাব নোৱাৰিব।"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"আপুনি এই ফ\'নত আপোনাৰ বাবে সংৰক্ষিত ঠাই আৰু ডেটা হেৰুৱাব। আপুনি এই কাৰ্য পিছত শুধৰাব নোৱাৰিব।"</string>
-    <string name="user_confirm_remove_message" msgid="362545924965977597">"সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
-    <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"যদিহে আপুনি অব্যাহত ৰাখে, তেন্তে এই প্ৰ\'ফাইলত থকা সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
-    <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"সকলো এপ আৰু ডেটা মচা হ\'ব।"</string>
+    <string name="user_confirm_remove_message" msgid="362545924965977597">"আটাইবোৰ এপ্ আৰু ডেটা মচা হ\'ব।"</string>
+    <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"যদিহে আপুনি অব্যাহত ৰাখে, তেন্তে এই প্ৰ\'ফাইলত থকা আটাইবোৰ এপ্ আৰু ডেটা মচা হ\'ব।"</string>
+    <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"আটাইবোৰ এপ্‌ আৰু ডেটা মচা হ\'ব।"</string>
     <string name="user_adding_new_user" msgid="7439602720177181412">"নতুন ব্যৱহাৰকাৰী যোগ কৰি থকা হৈছে…"</string>
     <string name="user_delete_user_description" msgid="7764153465503821011">"ব্যৱহাৰকাৰীক মচক"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"মচক"</string>
     <string name="user_guest" msgid="4545590092001460388">"অতিথি"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"অতিথি আঁতৰাওক"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"অতিথি আঁতৰাবনে?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"এই ছেছনৰ সকলো এপ্ আৰু ডেটা মচা হ\'ব।"</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"এই ছেছনৰ আটাইবোৰ এপ্ আৰু ডেটা মচা হ\'ব।"</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"আঁতৰাওক"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ফ\'ন কল অন কৰক"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ফ\'ন কল আৰু এছএমএছ অন কৰক"</string>
@@ -3631,7 +3635,7 @@
     <string name="vibrate_on_touch_title" msgid="9105544449810547716">"কম্পনক স্পৰ্শ কৰক"</string>
     <string name="vibrate_on_touch_summary" msgid="664831333409399440">"টিপা কাৰ্য, কীব\'ৰ্ড আৰু অধিক বস্তুৰ বাবে হেপ্টিক প্ৰতিক্ৰিয়া"</string>
     <string name="dock_audio_media_title" msgid="6474579339356398330">"ডক স্পীকাৰ প্লে\' হৈছে"</string>
-    <string name="dock_audio_media_disabled" msgid="8499927008999532341">"সকলো ধ্বনি"</string>
+    <string name="dock_audio_media_disabled" msgid="8499927008999532341">"আটাইবোৰ ধ্বনি"</string>
     <string name="dock_audio_media_enabled" msgid="4039126523653131281">"কেৱল মিডিয়া অডিঅ\'"</string>
     <string name="emergency_tone_silent" msgid="5048069815418450902">"নীৰৱতা"</string>
     <string name="emergency_tone_alert" msgid="1977698889522966589">"ট\'নসমূহ"</string>
@@ -3753,7 +3757,7 @@
     <string name="notification_dashboard_summary" msgid="7530169251902320652">"জাননীৰ ইতিহাস, বাৰ্তালাপ"</string>
     <string name="conversation_notifs_category" msgid="2549844862379963273">"বাৰ্তালাপ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"অলপতে পঠিওৱা হ’ল"</string>
-    <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"যোৱা ৭ দিনৰ সকলোখিনি চাওক"</string>
+    <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"যোৱা ৭ দিনৰ আটাইবোৰ চাওক"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"পৰিচালনা কৰক"</string>
     <string name="app_notification_field" msgid="3858667320444612716">"এপৰ ছেটিং"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"পৃথক পৃথক এপৰ পৰা অহা জাননী নিয়ন্ত্ৰণ কৰক"</string>
@@ -3798,11 +3802,11 @@
     <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"অন আছে / বার্তালাপসমূহ ওপঙা চিহ্ন হিচাপে প্ৰদর্শিত হ\'ব পাৰে"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"এপ্‌সমূহক bubbles দেখুৱাবলৈ অনুমতি দিয়ক"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"কিছুমান বার্তালাপ অন্য এপ্‌সমূহৰ ওপৰত ওপঙা চিহ্ন হিচাপে প্ৰদর্শিত হ\'ব"</string>
-    <string name="bubble_app_setting_all" msgid="312524752846978277">"সকলো বাৰ্তালাপ বাবল হ\'ব পাৰে"</string>
+    <string name="bubble_app_setting_all" msgid="312524752846978277">"আটাইবোৰ বাৰ্তালাপ বাবল হ\'ব পাৰে"</string>
     <string name="bubble_app_setting_selected" msgid="4324386074198040675">"বাছনি কৰা বার্তালাপসমূহ বাবল হ\'ব পাৰে"</string>
     <string name="bubble_app_setting_none" msgid="8643594711863996418">"একো বস্তু বাবল হ\'ব নোৱাৰে"</string>
     <string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"বাৰ্তালাপ"</string>
-    <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"ইয়াৰ বাহিৰে সকলো বাৰ্তালাপ বাবল হ’ব পাৰে"</string>
+    <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"ইয়াৰ বাহিৰে আটাইবোৰ বাৰ্তালাপ বাবল হ’ব পাৰে"</string>
     <string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"এই বার্তালাপটোৰ বাবে বাবল অফ কৰক"</string>
     <string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"এই বার্তালাপটোৰ বাবে বাবল অন কৰক"</string>
     <string name="swipe_direction_title" msgid="4260320464727178413">"ছোৱাইপ কাৰ্য"</string>
@@ -3837,7 +3841,7 @@
     <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"জাননী কেতিয়াও নেদেখুৱাব"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4688399629301178487">"আপুনি লক স্ক্ৰীন কিদৰে দেখুওৱাটো বিচাৰে?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"লক স্ক্ৰীন"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"সকলো কৰ্মস্থানৰ জাননী সমল দেখুৱাওক"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"কৰ্মস্থানৰ আটাইবোৰ জাননী সমল দেখুৱাওক"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="2183455323048921579">"কৰ্মস্থানৰ সংবেদনশীল সমল লুকুৱাওক"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"আপোনাৰ ডিভাইচটো লক হৈ থকা অৱস্থাত আপুনি প্ৰ’ফাইলৰ জাননীসমূহ কেনেকৈ দেখুওৱাটো বিচাৰে?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"প্ৰ\'ফাইলৰ জাননীসমূহ"</string>
@@ -3898,8 +3902,8 @@
     <string name="notification_conversation_summary_low" msgid="6352818857388412326">"কোনো ধ্বনি অথবা কম্পন নাই আৰু বাৰ্তালাপ শাখাটোৰ তলৰ অংশত দেখা পোৱা যায়"</string>
     <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_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="default_notification_assistant" msgid="243718059890346442">"অভিযোজিত জাননী"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="one">~প্ৰতিদিনে <xliff:g id="NUMBER_1">%d</xliff:g>টা জাননী</item>
@@ -3999,7 +4003,7 @@
     <string name="no_channels" msgid="4716199078612071915">"এই এপটোৱে এটাও জাননী দিয়া নাই"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"এপত থকা অতিৰিক্ত ছেটিং"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"জাননীৰ ইতিহাস, বাবলসমূহ, শেহতীয়াকৈ পঠিওৱা"</string>
-    <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"সকলো এপৰ বাবে অন কৰা হৈছে"</string>
+    <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"আটাইবোৰ এপৰ বাবে অন কৰা হৈছে"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টা এপৰ বাবে অফ কৰা হৈছে</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টা এপৰ বাবে অফ কৰা হৈছে</item>
@@ -4010,7 +4014,7 @@
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"অন কৰা হৈছে"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"অফ কৰি থোৱা হৈছে"</string>
-    <string name="app_notification_block_title" msgid="3880322745749900296">"সকলোবোৰ অৱৰোধ কৰক"</string>
+    <string name="app_notification_block_title" msgid="3880322745749900296">"আটাইবোৰ অৱৰোধ কৰক"</string>
     <string name="app_notification_block_summary" msgid="1804611676339341551">"এই জাননীবিলাক কেতিয়াও নেদেখুৱাব"</string>
     <string name="notification_content_block_title" msgid="6689085826061361351">"জাননীসমূহ দেখুৱাওক"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"শ্বেডত বা পেৰিফেৰাল ডিভাইচত জাননী কেতিয়াও নেদেখুৱাব"</string>
@@ -4075,7 +4079,7 @@
     <string name="summary_range_verbal_combination" msgid="6022314482293187463">"<xliff:g id="START">%1$s</xliff:g> পৰা <xliff:g id="END">%2$s</xliff:g> লৈ"</string>
     <string name="zen_mode_conversations_title" msgid="5491912973456026379">"বাৰ্তালাপ"</string>
     <string name="zen_mode_conversations_section_title" msgid="666809483050936026">"ব্যাঘাত জন্মাব পৰা বাৰ্তালাপসমূহ"</string>
-    <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"সকলো বাৰ্তালাপ"</string>
+    <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"আটাইবোৰ বাৰ্তালাপ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"একো নাই"</string>
     <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{এটাও নাই}=1{১ টা বাৰ্তালাপ}one{# টা বাৰ্তালাপ}other{# টা বাৰ্তালাপ}}"</string>
@@ -4095,8 +4099,8 @@
     <string name="zen_mode_messages_header" msgid="253721635061451577">"ব্যাঘাত জন্মাব পৰা বাৰ্তাসমূহ"</string>
     <string name="zen_mode_messages_footer" msgid="6002468050854126331">"অনুমতি দিয়া বার্তাসমূহ আহিলে যাতে ধ্বনি বজোৱা হয় তাক নিশ্চিত কৰিবলৈ ডিভাইচটো ৰিং কৰিবলৈ ছেট কৰা আছেনে পৰীক্ষা কৰক"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ ক্ষেত্ৰত অন্তৰ্গামী বাৰ্তাসমূহ অৱৰোধ কৰা হয়। আপুনি আপোনাৰ বন্ধুবৰ্গ, পৰিয়ালৰ লোক বা অইন সম্পৰ্কসমূহে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিং মিলাব পাৰে।"</string>
-    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"সকলো বাৰ্তাই আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
-    <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"সকলো কলে আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
+    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"আটাইবোৰ বাৰ্তাই আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
+    <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"আটাইবোৰ কলে আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
     <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{এটাও নাই}=1{১ টা সম্পৰ্ক}one{# টা সম্পর্ক}other{# টা সম্পর্ক}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যিকোনো লোক"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"সম্পর্কসমূহ"</string>
@@ -4132,15 +4136,15 @@
     <string name="zen_mode_bypassing_apps_none" msgid="7944221631721778096">"কোনো এপ্‌ বাছনি কৰা হোৱা নাই"</string>
     <string name="zen_mode_bypassing_apps_subtext_none" msgid="5128770411598722200">"কোনো এপে ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_bypassing_apps_add" msgid="5031919618521327102">"এপ্‌সমূহ যোগ কৰক"</string>
-    <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"সকলো জাননী"</string>
+    <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"আটাইবোৰ জাননী"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"আপুনি এপ্‌সমূহক ব্যাঘাত জন্মাবলৈ নিদিলেও বাছনি কৰা লোকসকলে তথাপি আপোনাৰ সৈতে যোগাযোগ কৰিব পাৰে"</string>
     <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{কোনো এপে ব্যাঘাত জন্মাব নোৱাৰে}=1{{app_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{app_1} আৰু {app_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{app_1}, {app_2} আৰু {app_3} এ ব্যাঘাত জন্মাব পাৰে}one{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"এপ্‌সমূহ"</string>
-    <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"সকলো জাননী"</string>
+    <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"আটাইবোৰ জাননী"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ব্যাঘাত জন্মাব পৰা জাননীসমূহ"</string>
-    <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"সকলো জাননীক অনুমতি দিয়ক"</string>
+    <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"আটাইবোৰ জাননীক অনুমতি দিয়ক"</string>
     <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{একোৱেই ব্যাঘাত জন্মাব নোৱাৰে}=1{{sound_category_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{sound_category_1} আৰু {sound_category_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{sound_category_1}, {sound_category_2} আৰু {sound_category_3}এ ব্যাঘাত জন্মাব পাৰে}one{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"কোনেও ব্যাঘাত জন্মাব নোৱাৰে"</string>
@@ -4266,9 +4270,9 @@
     <string name="storage_type_internal" msgid="979243131665635278">"অভ্যন্তৰীণ ষ্ট’ৰেজ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"বাহ্যিক ষ্ট’ৰেজ"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="DATE">%2$s</xliff:g>ৰ পিছত <xliff:g id="SIZE">%1$s</xliff:g> ব্যৱহৃত হৈছে"</string>
-    <string name="storage_used" msgid="2591194906751432725">"সঞ্চয়াগাৰ ব্যৱহাৰ কৰা হৈছে"</string>
+    <string name="storage_used" msgid="2591194906751432725">"ষ্ট’ৰেজ ব্যৱহাৰ কৰা হৈছে"</string>
     <string name="change" msgid="273206077375322595">"সলনি কৰক"</string>
-    <string name="change_storage" msgid="8773820275624113401">"সঞ্চয়াগাৰ সলনি কৰক"</string>
+    <string name="change_storage" msgid="8773820275624113401">"ষ্ট’ৰেজ সলনি কৰক"</string>
     <string name="notifications_label" msgid="8471624476040164538">"জাননীসমূহ"</string>
     <string name="notifications_enabled" msgid="7743168481579361019">"অন কৰা হৈছে"</string>
     <string name="notifications_enabled_with_info" msgid="1808946629277684308">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
@@ -4308,10 +4312,10 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> টা অব্যৱহৃত এপ্‌</item>
     </plurals>
     <string name="unused_apps_switch" msgid="419282628373205038">"অনুমতি আঁতৰাওক আৰু ঠাই খালী কৰক"</string>
-    <string name="filter_all_apps" msgid="6645539744080251371">"সকলো এপ্"</string>
+    <string name="filter_all_apps" msgid="6645539744080251371">"আটাইবোৰ এপ্"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"ইনষ্টল কৰা হোৱা এপসমূহ"</string>
     <string name="filter_instant_apps" msgid="2292108467020380068">"তাৎক্ষণিক এপ্‌সমূহ"</string>
-    <string name="filter_notif_all_apps" msgid="2764590815789208306">"এপ্: সকলো"</string>
+    <string name="filter_notif_all_apps" msgid="2764590815789208306">"এপ্: আটাইবোৰ"</string>
     <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"অফ কৰা হ’ল"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"শ্ৰেণী: অতি গুৰুত্বপূৰ্ণ"</string>
     <string name="filter_notif_low_channels" msgid="2163005243095264537">"শ্ৰেণীবোৰ: কম গুৰুত্বপূৰ্ণ"</string>
@@ -4358,7 +4362,7 @@
     <string name="default_app" msgid="445053777504688596">"(ডিফ\'ল্ট)"</string>
     <string name="system_app" msgid="1863291702508355041">"(ছিষ্টেম)"</string>
     <string name="system_default_app" msgid="2647834628622214931">"(ছিষ্টেম ডিফ\'ল্ট)"</string>
-    <string name="apps_storage" msgid="643866814746927111">"এপ্ সঞ্চয়াগাৰ"</string>
+    <string name="apps_storage" msgid="643866814746927111">"এপ্ ষ্ট’ৰেজ"</string>
     <string name="usage_access" msgid="5487993885373893282">"ব্যৱহাৰৰ অনুমতি"</string>
     <string name="permit_usage_access" msgid="179630895262172674">"ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="app_usage_preference" msgid="7062447555623339120">"এপ্ ব্যৱহাৰৰ অগ্ৰাধিকাৰসমূহ"</string>
@@ -4476,7 +4480,7 @@
     <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"এই এপ্‌টোৱে অসুবিধা নিদিব-ক অন/অফ কৰিব পাৰিব আৰু তাৰ লগত জড়িত ছেটিং সলনি কৰিব পাৰিব।"</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"জাননীৰ প্ৰৱেশ অন হৈ থকাৰ বাবে অন কৰি ৰাখিবৈ লাগিব"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>ৰ অসুবিধা নিদিবলৈ থকা প্ৰৱেশৰ অনুমতি প্ৰত্যাহাৰ কৰিবনে?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই এপে সৃষ্টি কৰা আটাইবোৰ অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ নকৰিব"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"আপোনাৰ বেটাৰী খৰকৈ শেষ কৰিব পাৰে। এপ্‌টোক নেপথ্যত বেটাৰী ব্যৱহাৰ কৰাত আৰু বাধা দিয়া নহ’ব।"</string>
@@ -4491,10 +4495,10 @@
     <string name="system_alert_window_access_title" msgid="3074573819155116817">"অন্য এপসমূহত দেখুৱাওক"</string>
     <string name="permit_draw_overlay" msgid="4468994037192804075">"অইন এপৰ ওপৰত দেখুৱাবলৈ অনুমতি দিয়ক"</string>
     <string name="allow_overlay_description" msgid="1607235723669496298">"আপুনি ব্যৱহাৰ কৰি থকা অন্য এপ্‌সমূহৰ ওপৰত এই এপ্‌টোক প্ৰদর্শন কৰিবলৈ অনুমতি দিয়ক। আপুনি ক\'ত টিপে অথবা সলনি কৰে তথা স্ক্ৰীনখনত কি প্ৰদর্শন কৰা হয় সেয়া এই এপ্‌টোৱে চাব পাৰিব।"</string>
-    <string name="manage_external_storage_title" msgid="8024521099838816100">"সকলো ফাইলৰ এক্সেছ"</string>
-    <string name="permit_manage_external_storage" msgid="6928847280689401761">"সকলো ফাইল পৰিচালনা কৰিবলৈ এক্সেছ দিয়ক"</string>
-    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"এই এপ্‌টোক এই ডিভাইচটোত অথবা অন্য যিকোনো সংযুক্ত ষ্ট\'ৰৰ ভলিউমসমূহত সকলো ফাইল পঢ়িব, সংশোধন কৰিব আৰু মচিবলৈ অনুমতি দিয়ক। যদি অনুমতি দিয়ে, আপোনাৰ নিশ্চিত জ্ঞানৰ অবিহনে এপে ফাইলবোৰ এক্সেছ কৰিব পাৰে।"</string>
-    <string name="filter_manage_external_storage" msgid="6751640571715343804">"সকলো ফাইল এক্সেছ কৰিব পাৰে"</string>
+    <string name="manage_external_storage_title" msgid="8024521099838816100">"আটাইবোৰ ফাইলৰ এক্সেছ"</string>
+    <string name="permit_manage_external_storage" msgid="6928847280689401761">"আটাইবোৰ ফাইল পৰিচালনা কৰিবলৈ এক্সেছ দিয়ক"</string>
+    <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"এই এপ্‌টোক এই ডিভাইচটোত অথবা অন্য যিকোনো সংযুক্ত ষ্ট’ৰেজৰ ভলিউমসমূহত আটাইবোৰ ফাইল পঢ়িবলৈ, সংশোধন কৰিবলৈ আৰু মচিবলৈ অনুমতি দিয়ক। যদি অনুমতি দিয়ে, আপোনাৰ নিশ্চিত জ্ঞানৰ অবিহনে এপে ফাইলবোৰ এক্সেছ কৰিব পাৰে।"</string>
+    <string name="filter_manage_external_storage" msgid="6751640571715343804">"আটাইবোৰ ফাইল এক্সেছ কৰিব পাৰে"</string>
     <string name="media_management_apps_title" msgid="8222942355578724582">"মিডিয়া পৰিচালনা কৰা এপ্‌"</string>
     <string name="media_management_apps_toggle_label" msgid="166724270857067456">"এপ্‌টোক মিডিয়া পৰিচালনা কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="media_management_apps_description" msgid="8000565658455268524">"অনুমতি দিলে, এই এপ্‌টোৱে আপোনাক নোসোধাকৈয়ে অন্য এপৰ জৰিয়তে সৃষ্টি কৰা মিডিয়া ফাইল সংশোধন কৰিব অথবা মচিব পাৰে। ফাইল আৰু মিডিয়া এক্সেছ কৰিবলৈ এপৰ ওচৰত অনুমতি থাকিবই লাগিব।"</string>
@@ -4547,11 +4551,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টা এপৰ বাবে বন্ধ কৰা আছে</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টা এপৰ বাবে বন্ধ কৰা আছে</item>
     </plurals>
-    <string name="notification_summary_none" msgid="9179312319023988089">"সকলো এপৰ বাবে অন"</string>
+    <string name="notification_summary_none" msgid="9179312319023988089">"আটাইবোৰ এপৰ বাবে অন"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g>টা এপ্‌ ইনষ্টল কৰা হৈছে"</string>
     <string name="apps_summary_example" msgid="6034002063446955592">"২৪টা এপ্ ইনষ্টল কৰা হৈছে"</string>
     <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহৃত - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী"</string>
-    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"আভ্যন্তৰিণ সঞ্চয়াগাৰ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহৃত - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী"</string>
+    <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"আভ্যন্তৰীণ ষ্ট’ৰেজ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহৃত - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী"</string>
     <string name="display_summary" msgid="5526061030874717172">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> নিষ্ক্ৰিয় হৈ থাকিলে সুপ্ত কৰক"</string>
     <string name="display_dashboard_summary" msgid="1599453894989339454">"গাঢ় ৰঙৰ থীম, ফণ্টৰ আকাৰ, উজ্জ্বলতা"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"১০ মিনিট ধৰি নিষ্ক্ৰিয় হৈ থাকিলে সুপ্ত কৰক"</string>
@@ -4755,7 +4759,7 @@
     <string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManagerৰ নিৰিখ-সীমাবদ্ধকৰণ ৰিছেট কৰা হ’ল"</string>
     <string name="notification_suggestion_title" msgid="6309263655965785411">"লক স্ক্ৰীনত ওলোৱা তথ্য নিয়ন্ত্ৰণ কৰক"</string>
     <string name="notification_suggestion_summary" msgid="7615611244249276113">"জাননীৰ সমল দেখুৱাওক বা লুকুৱাওক"</string>
-    <string name="page_tab_title_summary" msgid="7188875610123234454">"সকলো"</string>
+    <string name="page_tab_title_summary" msgid="7188875610123234454">"আটাইবোৰ"</string>
     <string name="page_tab_title_support" msgid="3235725053332345773">"উপদেশ আৰু সহায়"</string>
     <string name="developer_smallest_width" msgid="632354817870920911">"সকলোতকৈ সৰু পুতল"</string>
     <string name="premium_sms_none" msgid="8737045049886416739">"ইনষ্টল কৰি ৰখা কোনো এপে প্ৰিমিয়াম এছএমএছ পঠাবলৈ অনুমতি বিচাৰি অনুৰোধ কৰা নাই"</string>
@@ -4796,10 +4800,10 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ছেকেণ্ড</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ছেকেণ্ড</item>
     </plurals>
-    <string name="automatic_storage_manager_settings" msgid="519158151463974656">"সঞ্চয়াগাৰ পৰিচালনা কৰক"</string>
-    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"সঞ্চয়াগাৰত ঠাই খালী কৰিবৰ কাৰণে সহায় কৰিবলৈ সঞ্চয়াগাৰ মেনেজাৰে আপোনাৰ ডিভাইচৰ পৰা বেকআপ কৰা ফট\' আৰু ভিডিঅ\'বোৰ আঁতৰাই দিয়ে।"</string>
+    <string name="automatic_storage_manager_settings" msgid="519158151463974656">"ষ্ট’ৰেজ পৰিচালনা কৰক"</string>
+    <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ষ্ট’ৰেজত ঠাই খালী কৰিবৰ কাৰণে সহায় কৰিবলৈ ষ্ট’ৰেজ পৰিচালকে আপোনাৰ ডিভাইচৰ পৰা বেকআপ লৈ থোৱা ফট’ আৰু ভিডিঅ’বোৰ আঁতৰায়।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ফট\' আৰু ভিডিঅ\'সমূহ আঁতৰাওক"</string>
-    <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"সঞ্চয়াগাৰ পৰিচালক"</string>
+    <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ষ্ট’ৰেজ পৰিচালক"</string>
     <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ষ্ট’ৰেজ পৰিচালক ব্যৱহাৰ কৰক"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"স্বয়ংক্ৰিয়"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"হস্তকৃত"</string>
@@ -4816,7 +4820,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"ছেলফি দ্ৰুতভাৱে তোলক"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"ছিষ্টেম নেভিগেশ্বন"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"২টা বুটামেৰে কৰা নেভিগেশ্বন"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"এপ্‌সমূহ সলনি কৰিবলৈ, গৃহপৃষ্ঠা বুটামত ওপৰলৈ ছোৱাইপ কৰক। সকলো এপ্‌ চাবলৈ আকৌ ওপৰলৈ ছোৱাইপ কৰক। উভতি যাবলৈ পিছলৈ বুটামটো টিপক।"</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"এপ্‌সমূহ সলনি কৰিবলৈ, গৃহপৃষ্ঠা বুটামত ওপৰলৈ ছোৱাইপ কৰক। আটাইবোৰ এপ্‌ চাবলৈ আকৌ ওপৰলৈ ছোৱাইপ কৰক। উভতি যাবলৈ পিছলৈ বুটামটো টিপক।"</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"নতুন গৃহ বুটাম ব্য়ৱহাৰ কৰি চাওক"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"বেলেগ এপ্ ব্যৱহাৰ কৰিবলৈ নতুন নিৰ্দেশটো অন কৰক"</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"সুৰক্ষা আৰু জৰুৰীকালীন"</string>
@@ -4895,7 +4899,7 @@
     <string name="web_action_section_title" msgid="994717569424234098">"তাৎক্ষণিক এপ্‌সমূহ"</string>
     <string name="instant_apps_settings" msgid="4280942494969957858">"তাৎক্ষণিক এপ্‌সমূহৰ অগ্ৰাধিকাৰবোৰ"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"ইনষ্টল কৰা হোৱা এপসমূহ"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"আপোনাৰ সঞ্চয়াগাৰ এতিয়া সঞ্চয়াগাৰ পৰিচালকে পৰিচালনা কৰিছে"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"আপোনাৰ ষ্ট’ৰেজ এতিয়া ষ্ট’ৰেজ পৰিচালকে পৰিচালনা কৰিছে"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g>ৰ বাবে একাউণ্ট"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"কনফিগাৰ কৰক"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"এপৰ ডেটা স্বয়ংক্ৰিয়ভাৱে ছিংক কৰক"</string>
@@ -4904,8 +4908,8 @@
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"এপ্‌বোৰক স্বয়ংক্ৰিয়ভাৱে ডেটা ৰিফ্ৰেশ্ব কৰিবলৈ দিয়ক"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"একাউণ্ট ছিংক"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g>টা আইটেমৰ <xliff:g id="ID_1">%1$d</xliff:g>টাৰ বাবে ছিংক অন হৈ আছে"</string>
-    <string name="account_sync_summary_all_on" msgid="2953682111836599841">"সকলো বস্তুৰ বাবে ছিংক অন হৈ আছে"</string>
-    <string name="account_sync_summary_all_off" msgid="6378301874540507884">"সকলো বস্তুৰ বাবে ছিংক অফহৈ আছে"</string>
+    <string name="account_sync_summary_all_on" msgid="2953682111836599841">"আটাইবোৰ বস্তুৰ বাবে ছিংক অন হৈ আছে"</string>
+    <string name="account_sync_summary_all_off" msgid="6378301874540507884">"আটাইবোৰ বস্তুৰ বাবে ছিংক অফ হৈ আছে"</string>
     <string name="enterprise_privacy_settings" msgid="786350385374794180">"ডিভাইচ সম্পৰ্কীয় তথ্য পৰিচালনা কৰক"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"আপোনাৰ প্ৰতিষ্ঠানে সাল-সলনি আৰু ছেটিং পৰিচালনা কৰে"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"সাল-সলনি আৰু ছেটিং <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>এ পৰিচালনা কৰে"</string>
@@ -4948,8 +4952,8 @@
       <item quantity="other">ন্যূনতম <xliff:g id="COUNT_1">%d</xliff:g> খন চিএ প্ৰমাণপত্ৰ</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"প্ৰশাসকে ডিভাইচটো লক কৰিব আৰু পাছৱৰ্ড ৰিছেট কৰিব পাৰে"</string>
-    <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"প্ৰশাসকে ডিভাইচৰ সকলো ডেটা মচিব পাৰে"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"ডিভাইচৰ সকলো ডেটা মচাৰ পূৰ্বে সঠিক পাছৱৰ্ড দিয়াৰ প্ৰচেষ্টা ব্যৰ্থ হ’ল"</string>
+    <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"প্ৰশাসকে ডিভাইচৰ আটাইবোৰ ডেটা মচিব পাৰে"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"ডিভাইচৰ আটাইবোৰ ডেটা মচাৰ পূৰ্বে সঠিক পাছৱৰ্ড দিয়াৰ প্ৰচেষ্টা ব্যৰ্থ হ’ল"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"কৰ্মস্থানৰ ডেটা মচাৰ আগতে কেইবাবাৰো ভূল পাছৱৰ্ড টাইপ কৰা হ’ল"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> প্ৰয়াস</item>
@@ -5031,16 +5035,16 @@
     <string name="location_indicator_settings_title" msgid="6655916258720093451">"স্থিতি দণ্ডত অৱস্থানৰ সূচক"</string>
     <string name="location_indicator_settings_description" msgid="2888022085372804021">"নেটৱৰ্ক আৰু সংযোগকে ধৰি আটাইবোৰ অৱস্থানৰ বাবে দেখুৱাওক"</string>
     <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ আটাইবোৰ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
     <string name="device_theme" msgid="5027604586494772471">"ডিভাইচৰ থিম"</string>
     <string name="default_theme" msgid="4815428567082263639">"ডিফ\'ল্ট"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"নেটৱৰ্কৰ নাম"</string>
     <string name="show_operator_name_summary" msgid="5352696579216501773">"স্থিতি বাৰত নেটৱৰ্কৰ নাম দেখুৱাওক"</string>
-    <string name="storage_manager_indicator" msgid="6187509172735927297">"সঞ্চয়াগাৰ পৰিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator" msgid="6187509172735927297">"ষ্ট’ৰেজ পৰিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="2705959642617709265">"অফ"</string>
     <string name="storage_manager_indicator_on" msgid="8380330763647785309">"অন"</string>
     <string name="install_type_instant" msgid="7685381859060486009">"তাৎক্ষণিক এপ্"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"সঞ্চয়াগাৰ পৰিচালকক অফ কৰিবনে?"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"ষ্ট’ৰেজ পৰিচালকক অফ কৰিবনে?"</string>
     <string name="storage_movies_tv" msgid="7897612625450668593">"চিনেমা আৰু টিভি এপ"</string>
     <string name="carrier_provisioning" msgid="7217868336140325816">"বাহকৰ প্ৰ\'ভিজনিং তথ্য"</string>
     <string name="trigger_carrier_provisioning" msgid="3288805742683538597">"কেৰিয়াৰ প্ৰভিজনিং সূচনা কৰক"</string>
@@ -5056,7 +5060,7 @@
     <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"গ্ৰাফিক্স ড্ৰাইভাৰৰ অগ্ৰাধিকাৰসমূহ"</string>
     <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"গ্ৰাফিক্স ড্ৰাইভাৰৰ ছেটিং সংশোধন কৰক"</string>
     <string name="graphics_driver_footer_text" msgid="5123754522284046790">"যেতিয়া একাধিক গ্ৰাফিক্স ড্ৰাইভাৰ থাকে, তেতিয়া আপুনি ডিভাইচটোত ইনষ্টল কৰি থোৱা এপ্‌সমূহৰ ক্ষেত্ৰত ব্যৱহাৰ কৰিবলৈ আপডে’ট কৰা গ্ৰাফিক্স ড্ৰাইভাৰটো বাছনি কৰিব পাৰে।"</string>
-    <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সকলো এপৰ বাবে সক্ষম কৰক"</string>
+    <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"আটাইবোৰ এপৰ বাবে সক্ষম কৰক"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্ৰাফিক্স ড্ৰাইভাৰ বাছনি কৰক"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফ’ল্ট"</string>
     <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গে’ম ড্ৰাইভাৰ"</string>
@@ -5121,7 +5125,7 @@
     <string name="pref_title_network_details" msgid="7329759534269363308">"নেটৱৰ্কৰ সবিশেষ"</string>
     <string name="about_phone_device_name_warning" msgid="1938930553285875166">"আপোনাৰ ডিভাইচটোৰ নাম আপোনাৰ ফ’নটোত থকা এপ্‌সমূহৰ বাবে দৃশ্যমান। আপুনি ব্লুটুথ ডিভাইচৰ সৈতে সংযোগ কৰোঁতে, ৱাই-ফাই নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে অথবা ৱাই-ফাই হটস্পট ছেট আপ কৰোঁতেও এইটো অন্য লোকে দেখা পাব পাৰে।"</string>
     <string name="devices_title" msgid="649715719278562515">"ডিভাইচসমূহ"</string>
-    <string name="homepage_all_settings" msgid="1877827279189801035">"সকলো ছেটিং"</string>
+    <string name="homepage_all_settings" msgid="1877827279189801035">"আটাইবোৰ ছেটিং"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"পৰামৰ্শ"</string>
     <string name="choose_network_title" msgid="5355609223363859430">"নেটৱৰ্ক বাছনি কৰক"</string>
     <string name="network_disconnected" msgid="8281188173486212661">"সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
@@ -5312,7 +5316,7 @@
     <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"কিবা এটা সমস্যা হৈছে। এপ্লিকেশ্বনটোৱে ডিভাইচ বাচনি কৰাৰ অনুৰোধ বাতিল কৰিলে।"</string>
     <string name="network_connection_connect_successful" msgid="2587314077675642476">"সংযোগ সফল হৈছে"</string>
     <string name="network_connection_connect_failure" msgid="6803313816657494319">"সংযোগ কৰিব পৰা নগ’ল"</string>
-    <string name="network_connection_request_dialog_showall" msgid="6392059758456994944">"সকলো দেখুৱাওক"</string>
+    <string name="network_connection_request_dialog_showall" msgid="6392059758456994944">"আটাইবোৰ দেখুৱাওক"</string>
     <string name="network_connection_searching_message" msgid="8521819623516926482">"ডিভাইচৰ সন্ধান কৰি থকা হৈছে…"</string>
     <string name="network_connection_connecting_message" msgid="433189540877274889">"ডিভাইচৰ সৈতে সংযোগ কৰি থকা হৈছে…"</string>
     <string name="bluetooth_left_name" msgid="7440064067910080502">"বাওঁ"</string>
@@ -5335,14 +5339,14 @@
     <string name="contextual_card_dismiss_confirm_message" msgid="6434344989238055188">"এই পৰামৰ্শটো আঁতৰাবনে?"</string>
     <string name="contextual_card_removed_message" msgid="5755438207494260867">"পৰামৰ্শ আঁতৰোৱা হ’ল"</string>
     <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"আনডু কৰক"</string>
-    <string name="low_storage_summary" msgid="1979492757417779718">"সঞ্চয়াগাৰত খালী ঠাই কম আছে। <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহাৰ হৈ আছে - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী আছে"</string>
+    <string name="low_storage_summary" msgid="1979492757417779718">"ষ্ট’ৰেজত খালী ঠাই কম আছে। <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহাৰ হৈ আছে - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী আছে"</string>
     <string name="contextual_card_feedback_send" msgid="7409408664417908922">"মতামত পঠিয়াওক"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"আপুনি এই পৰামৰ্শটোৰ বিষয়ে আমাক মতামত দিবনে?"</string>
     <string name="copyable_slice_toast" msgid="1008251852798990606">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> ক্লিপব’ৰ্ডত প্ৰতিলিপি কৰা হ’ল"</string>
     <string name="search_bar_account_avatar_content_description" msgid="880523277036898350"></string>
     <string name="permission_bar_chart_empty_text" msgid="4856719891991325077">"০টা এপে অনুমতি ব্যৱহাৰ কৰিছে"</string>
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"যোৱা ২৪ ঘণ্টাৰ কৰা অনুমতিৰ ব্যৱহাৰ"</string>
-    <string name="permission_bar_chart_details" msgid="5816698018592357088">"সকলো ডেশ্বব’ৰ্ডত চাওক"</string>
+    <string name="permission_bar_chart_details" msgid="5816698018592357088">"ডেশ্বব’ৰ্ডত আটাইবোৰ চাওক"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g>টা এপ্</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g>টা এপ্</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index c3fa780..e93b61a 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Siz, həmçinin, digər cihaza bu PIN kodu daxil etməli ola bilərsiniz."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Siz bu əsas açarı digər cihazda da yazmalı ola bilərsiniz."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; ilə birləşdirmək üçün, onun bu ana açarı göstərdiyinə əmin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Əlaqələndirilmiş dəstlə birləşdirməyi təsdiq edin"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kimdən:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cihazınız bu cihazla cütləşsin?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Bunlarla cütlənmək üçün:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Bunu yazın:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, sonra Geri və ya Giriş basın."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontaktlar və zəng tarixçəsinə giriş icazəsi verin"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Qoşulmaq mümkün olmadı. Yenidən cəhd edin."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Cihaz məlumatları"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Cihazın Bluetooth ünvanı: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Cihazın Bluetooth ünvanı:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Cihaz unudulsun?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Əlaqəni silin"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Tətbiq ayrılsın?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ayarları yadda saxlayın"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Qoşulu Bluetooth audiocihazlarının maksimal sayı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Qoşulu Bluetooth audiocihazlarının maksimal sayını bildirin"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC yığın sazlama qeydiyyatı"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC yığın qeydiyyat səviyyəsini artırın"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayım"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"güzgü"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Naqilsiz displeyi aktivləşdirin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index e8800ae..35a9dc9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -842,6 +842,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda će biti potrebno da unesete ovaj PIN i na drugom uređaju."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda će biti potrebno da unesete ovaj pristupni kôd i na drugom uređaju."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Da biste se uparili sa uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uverite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite radi uparivanja sa koordinisanim skupom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Sa uređaja:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Želite li da se uparite sa tim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Za uparivanje sa uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Unesite na njemu:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a zatim pritisnite Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvoli pristup kontaktima i istoriji poziva"</string>
@@ -875,6 +876,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezivanje nije uspelo. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalji o uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Želite li da zaboravite uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ukloni povezivanje"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Želite da prekinete vezu sa aplikacijom?"</string>
@@ -907,6 +909,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti podešavanja"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Izaberite maksimalni broj povezanih Bluetooth audio uređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Evidencija otklanjanja grešaka za NFC grupu"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte nivo evidencije za NFC grupu"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prebacivanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikati"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -2699,7 +2703,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Najveća potrošnja baterije"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Pogledajte aplikacije sa najvećom potrošnjom baterije"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Punjenje je privremeno ograničeno"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Za uštedu baterije. Saznajte više."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Da bi se sačuvala baterija. Saznajte više."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Nastavi sa punjenjem"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"U određenim uslovima, na primer, visoke temperature i dugi periodi punjenja, punjenje može da bude ograničeno na <xliff:g id="PERCENT">%1$s</xliff:g> radi boljeg stanja baterije.\n\nKada ti uslovi prestanu, telefon će automatski početi normalno da se puni."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"U određenim uslovima, na primer, visoke temperature i dugi periodi punjenja, punjenje može da bude ograničeno na <xliff:g id="PERCENT">%1$s</xliff:g> radi boljeg stanja baterije.\n\nKada ti uslovi prestanu, tablet će automatski početi normalno da se puni."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 71a1325..c14b21f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -861,6 +861,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Вам таксама можа спатрэбіцца ўвесці гэты PIN-код на іншай прыладзе."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Вам таксама можа спатрэбіцца ўвесці гэты ключ доступу на іншай прыладзе."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Каб падключыцца да прылады &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;пераканайцеся, што яна адлюстроўвае ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Пацвердзіце спалучэнне з узгодненым наборам"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ад: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>Падключыцца да гэтай прылады?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Каб падключыцца да прылады <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, увядзiце <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, затым нацiснiце \"Назад\" або Enter"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дазвольце доступ да сваіх кантактаў і гісторыі выклікаў"</string>
@@ -894,6 +895,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не атрымалася ўсталяваць злучэнне. Паўтарыце спробу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Звесткі пра прыладу"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адрас Bluetooth прылады: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрас Bluetooth прылады: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Забыць прыладу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Выдаліць сувязь"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Адключыць праграму?"</string>
@@ -926,6 +928,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомніць налады"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максімальная колькасць падключаных аўдыяпрылад Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Выбар максімальнай колькасці падключаных аўдыяпрылад Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал адладкі стоса NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Павысіць узровень вядзення журналаў для стоса NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляцыя"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"адлюстраванне"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Уключыць бесправадны дысплей"</string>
@@ -2607,7 +2611,7 @@
     <string name="keywords_accessibility" msgid="4263443239404659143">"Лёгкасць выкарыстання, прастата доступу, дапамога, дапаможны"</string>
     <string name="keywords_magnification" msgid="3908145308269840862">"Лупа для акна, маштаб, павелічэнне, слабы зрок, павялічыць, зрабіць большым"</string>
     <string name="keywords_talkback" msgid="2816435437095102527"></string>
-    <string name="keywords_live_caption" msgid="1667203998080567556">"Субцітры, субцітры, цітры, Імгненная транскрыпцыя, слабы слых, страта слыху, транскрыпцыя ў рэальным часе, пераўтварэнне маўлення ў тэкст, субцітр"</string>
+    <string name="keywords_live_caption" msgid="1667203998080567556">"Субцітры, цітры, Імгненная расшыфроўка, слабы слых, страта слыху, расшыфроўка ў рэальным часе, пераўтварэнне маўлення ў тэкст, субцітр"</string>
     <string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
     <string name="keywords_sound_notifications" msgid="8183107485754075413"></string>
     <string name="keywords_sound_amplifier" msgid="939404835256246663"></string>
@@ -2931,7 +2935,7 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Абнавіць"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Сервер медыя"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"Аптымізацыя дадаткаў"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Эканомія зараду"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Рэжым энергазберажэння"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Уключаць аўтаматычна"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Няма раскладу"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"На падставе распарадку"</string>
@@ -3150,7 +3154,7 @@
     <string name="sync_in_progress" msgid="6200093151211458977">"Сінхранiзаваць зараз"</string>
     <string name="settings_backup" msgid="5357973563989458049">"Налады рэзервовага капіявання"</string>
     <string name="settings_backup_summary" msgid="6803046376335724034">"Рэзервовае капіяванне маіх налад"</string>
-    <string name="sync_menu_sync_now" msgid="3948443642329221882">"Сінхранізаваць цяпер"</string>
+    <string name="sync_menu_sync_now" msgid="3948443642329221882">"Сінхранізаваць зараз"</string>
     <string name="sync_menu_sync_cancel" msgid="2422994461106269813">"Адмяніць сінхранізацыю"</string>
     <string name="sync_one_time_sync" msgid="8114337154112057462">"Краніце, каб сінхранізаваць зараз<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0f13d09..a682709 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Възможно е също така да се наложи да въведете този ПИН на другото устройство."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Възможно е също така да се наложи да въведете този код за достъп на другото устройство."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"За сдвояване със::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверете се, че показва този код за достъп:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потвърдете, за да сдвоите с координирания набор"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"От:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Да се сдвои ли с това устройство?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За сдвояване със: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Въведете: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, след това натиснете „Return“ или „Enter“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешаване на достъпа до контактите и историята на обажданията ви"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не можа да се установи връзка. Опитайте отново."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Подробности за устройството"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth адрес на устройството: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрес на Bluetooth на устройството: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Да се забрави ли устройството?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Премахване на свързването"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Да се прекрати ли връзката с приложението?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомняне на настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимален брой свързани аудиоустройства с Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изберете максималния брой свързани аудиоустройства с Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Регистрац. файлове за отстраняване на грешки за стека за NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Увеличаване на нивото на регистриране за стека за NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Предаване"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублиране"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Активир. на безжичния дисплей"</string>
@@ -4689,7 +4693,7 @@
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен достъп до данни"</string>
     <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Данните на заден план са изключени"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Включено"</string>
-    <string name="data_saver_off" msgid="5891210864117269045">"Изключено"</string>
+    <string name="data_saver_off" msgid="5891210864117269045">"Изкл."</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Използване на „Икономия на данни“"</string>
     <string name="unrestricted_app_title" msgid="7117585996574329284">"Неограничен пренос на данни"</string>
     <string name="unrestricted_app_summary" msgid="282698963532000403">"Пълен достъп до данните при вкл. „Икономия на данни“"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 491a150..a2649a6 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"আপনাকে অন্য ডিভাইসে এই পিন টাইপ করতে হতে পারে।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"আপনাকে অন্য ডিভাইসে এই পাস কী টাইপ করতে হতে পারে।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"এর সঙ্গে যুক্ত করতে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;নিশ্চিত করুন যে এটি এই পাস কী দেখাচ্ছে:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"কো-অর্ডিনেটেড সেটের সাথে পেয়ার করার বিষয়টি কনফার্ম করুন"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"এর থেকে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এই ডিভাইসের সঙ্গে যুক্ত করবেন?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"এর সঙ্গে যুক্ত করতে:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>এটিতে টাইপ করুন:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তারপর Return বা Enter টিপুন।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপনার পরিচিতি এবং কল ইতিহাস অ্যাক্সেসের অনুমতি দিন"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"কানেক্ট করা যায়নি। আবার চেষ্টা করুন।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ডিভাইসের বিবরণ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ডিভাইসের ব্লুটুথ অ্যাড্রেস: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ডিভাইসের ব্লুটুথ অ্যাড্রেস:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ডিভাইসটি কি ভুলে যাবেন?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ডিসকানেক্ট করুন"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"অ্যাপ ডিসকানেক্ট করতে চান?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"সেটিংস মনে রাখুন"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ব্লুটুথের মাধ্যমে কানেক্ট সর্বাধিক অডিও ডিভাইস"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"সর্বাধিক কতগুলি অডিও ডিভাইস ব্লুটুথের মাধ্যমে কানেক্ট করা যাবে তা নির্দিষ্ট করুন"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC স্ট্যাক ডিবাগ লগ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-এর স্ট্যাক লগ করার লেভেল বাড়ান"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"কাস্ট করুন"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"মিরর"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ওয়্যারলেস প্রদর্শন সক্ষম করুন"</string>
@@ -3795,7 +3799,7 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"এই অ্যাপে \'বাবল\' ফিচার চালু করা হলে, আপনার ডিভাইসের জন্যও এটি চালু হয়ে যাবে।\n\nএর ফলে সেই সব অ্যাপ ও কথোপকথন প্রভাবিত হবে, যেগুলির কাছে \'বাবল\' ফিচার ব্যবহার করার অনুমতি আছে।"</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"চালু করুন"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"বাতিল করুন"</string>
-    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"চালু করুন / কথোপকথন ভাসমান আইকন হিসেবে দেখা যেতে পারে"</string>
+    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"চালু আছে / কথোপকথন ভাসমান আইকন হিসেবে দেখা যেতে পারে"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"অ্যাপকে বাবল দেখানোর অনুমতি দিন"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"কিছু কথোপকথন অন্যান্য অ্যাপের উপর ভাসমান আইকন হিসেবে দেখা যাবে"</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"সব কথোপকথন বাবল হিসেবে দেখুন"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 8e60228..218bed2 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -541,7 +541,7 @@
     <item msgid="6691772120712000966">"Automatski"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5746729990546256950">"Preferiraj GSM/WCDMA"</item>
+    <item msgid="5746729990546256950">"Preferira se GSM/WCDMA"</item>
     <item msgid="6443811977675152844">"Samo GSM"</item>
     <item msgid="8767554719068876877">"Samo WCDMA"</item>
     <item msgid="928773614806830223">"Automatski GSM/WCDMA"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b4e35c2..b4bed92 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -842,6 +842,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda ćete morati otkucati ovaj PIN i na drugom uređaju."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda ćete morati otkucati ovaj pristupni kôd na drugom uređaju."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Da biste izvršilu uparivanje s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Provjerite da li se prikazuje sljedeći pristupni ključ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite da uparite s koordiniranim kompletom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Želite izvršiti uparivanje s ovim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Da biste izvršili uparivanje s uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Otkucajte na njemu:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a zatim pritisnite Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvolite pristup kontaktima i historiji poziva"</string>
@@ -875,6 +876,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nije povezan. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalji o uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zaboraviti uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Uklonite povezanost"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Prekinuti vezu s aplikacijom?"</string>
@@ -907,6 +909,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audio uređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Odaberite maksimalan broj povezanih Bluetooth audio uređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Povećajte nivo evidentiranja za NFC grupu"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte nivo zapisivanja za NFC grupu"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"preslikavanje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -1551,7 +1555,7 @@
     <string name="status_signal_strength" msgid="7644525712554444359">"Jačina signala"</string>
     <string name="status_roaming" msgid="1253597174715663778">"Roming"</string>
     <string name="status_operator" msgid="4335640583552058491">"Mreža"</string>
-    <string name="status_wifi_mac_address" msgid="4447611754614388914">"MAC adresa WiFi mreže"</string>
+    <string name="status_wifi_mac_address" msgid="4447611754614388914">"MAC adresa WiFi-ja"</string>
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"MAC adresa uređaja za WiFi mrežu"</string>
     <string name="status_bt_address" msgid="6919660304578476547">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="9060064164331466789">"Serijski broj"</string>
@@ -2962,9 +2966,9 @@
     <string name="voice_input_output_settings_title" msgid="6449454483955543064">"Postavke glasovnog unosa i izlaza"</string>
     <string name="voice_search_settings_title" msgid="228743187532160069">"Glasovno pretraživanje"</string>
     <string name="keyboard_settings_title" msgid="2199286020368890114">"Android tastatura"</string>
-    <string name="voice_input_settings" msgid="105821652985768064">"Podešavanja govornog unosa"</string>
-    <string name="voice_input_settings_title" msgid="3708147270767296322">"Govorni unos"</string>
-    <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Usluge govornog unosa"</string>
+    <string name="voice_input_settings" msgid="105821652985768064">"Podešavanja glasovnog unosa"</string>
+    <string name="voice_input_settings_title" msgid="3708147270767296322">"Glasovni unos"</string>
+    <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Usluge glasovnog unosa"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Cela aktuelna reč i interakcija"</string>
     <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Ova usluga za glasovni unos će biti u mogućnosti da obavlja uvijek uključeno praćenje glasa i da u vaše ime kontrolira aplikacije omogućene glasom. Ona dolazi iz <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikacija. Omogućiti korištenje ove usluge?"</string>
@@ -3968,7 +3972,7 @@
       <item quantity="other">%d aplikacija može čitati obavještenja</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Poboljšana obavještenja"</string>
-    <string name="notification_assistant_summary" msgid="1957783114840908887">"Primajte preporučene radnje, odgovore i još mnogo toga"</string>
+    <string name="notification_assistant_summary" msgid="1957783114840908887">"Primajte preporučene radnje, odgovore i drugo"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Nema"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Nijedna instalirana aplikacija nije zatražila pristup obavještenjima."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Dozvoli pristup obavještenjima"</string>
@@ -4003,7 +4007,7 @@
     <string name="display_vr_pref_off" msgid="4008841566387432721">"Smanjenje treperenja"</string>
     <string name="picture_in_picture_title" msgid="9001594281840542493">"Slika u slici"</string>
     <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Nijedna instalirana aplikacija ne podržava način rada slike u slici"</string>
-    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"sus slika u"</string>
+    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"slika u slici"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"Slika u slici"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Dozvoli način rada slike u slici"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Dozvolite aplikaciji da kreira prozor sa slikom u slici dok je aplikacija otvorena ili nakon što je napustite (naprimjer, da nastavite gledati videozapis). Ovaj prozor se prikazuje preko drugih aplikacija koje koristite."</string>
@@ -4847,7 +4851,7 @@
     <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"Privremeno uključeno zbog Uštede baterije"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"Podržane aplikacije će se također prebaciti na tamnu temu"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"Razumijem"</string>
-    <string name="dark_theme_slice_title" msgid="4684222119481114062">"Isprobajte Tamnu temu"</string>
+    <string name="dark_theme_slice_title" msgid="4684222119481114062">"Isprobajte tamnu temu"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Pomaže da se produži vijek trajanja baterije"</string>
     <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Pločice programera za brze postavke"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Onemogući istek vremena za adb ovlaštenje"</string>
@@ -5320,7 +5324,7 @@
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operater"</string>
     <string name="carrier_settings_version" msgid="3364919669057317776">"Verzija postavki mobilnog operatera"</string>
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
-    <string name="video_calling_settings_title" msgid="5490466306783552190">"Operater video pozivanja"</string>
+    <string name="video_calling_settings_title" msgid="5490466306783552190">"Video pozivi putem mobilnog operatera"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Odabir sistema"</string>
     <string name="cdma_system_select_summary" msgid="384128007068464145">"Promijenite način rada CDMA rominga"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6143586810486936984">"Odabir sistema"</string>
@@ -5528,7 +5532,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
-    <string name="wifi_switch_summary" msgid="3577154777754849024">"Pronađite WiFi mreže i povežite se s njima"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Pronađite WiFi mreže i povežite se"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigurno za rad u avionu"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Pozivanje putem WiFi-ja"</string>
@@ -5593,7 +5597,7 @@
     <string name="category_name_display_controls" msgid="7046581691184725216">"Ostale kontrole ekrana"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Opće"</string>
-    <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"Koristi Tamnu temu"</string>
+    <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"Koristi tamnu temu"</string>
     <string name="bluetooth_main_switch_title" msgid="8409835540311309632">"Koristi Bluetooth"</string>
     <string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Koristi sprečavanje zvonjenja"</string>
     <string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Koristi WiFi pristupnu tačku"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 832ae14..9ca2e54 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -33,7 +33,7 @@
     <string name="header_category_wireless_networks" msgid="303445626075235229">"Connexions sense fil i xarxes"</string>
     <string name="header_category_system" msgid="1665516346845259058">"Sistema"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"En servei"</string>
-    <string name="radioInfo_service_out" msgid="1868347333892403287">"Sense servei"</string>
+    <string name="radioInfo_service_out" msgid="1868347333892403287">"Fora de servei"</string>
     <string name="radioInfo_service_emergency" msgid="6838935881091760942">"Només trucades d\'emergència"</string>
     <string name="radioInfo_service_off" msgid="6184928420860868571">"Senyal mòbil desactivat"</string>
     <string name="radioInfo_roaming_in" msgid="8892550453644088692">"Itinerància"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Pot ser que també hagis d\'introduir aquest PIN a l\'altre dispositiu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Pot ser que també hagis d\'introduir aquesta clau d\'accés a l\'altre dispositiu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Per vincular a &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;assegura\'t que es mostra aquesta clau d\'accés:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma per vincular amb el conjunt coordinat"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vols vincular aquest dispositiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Per vincular a <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>escriu-hi <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> i, a continuació, prem Retorn."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permet l\'accés als contactes i a l\'historial de trucades"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No s\'ha pogut connectar. Torna-ho a provar."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalls del dispositiu"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adreça Bluetooth del dispositiu: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adreça Bluetooth del dispositiu:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vols que s\'oblidi el dispositiu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Suprimeix l\'associació"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vols desconnectar l\'aplicació?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Recorda la configuració"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona el nombre màxim de dispositius d\'àudio Bluetooth connectats"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registre de depuració de la pila de l\'NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Augmenta el nivell de registre de la pila de l\'NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emet"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"projectar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activa pantalla sense fil"</string>
@@ -1266,7 +1270,7 @@
     <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"So en marcar el número"</string>
     <string name="sound_effects_enable_title" msgid="328569690466233866">"Toca els sons"</string>
     <string name="lock_sounds_enable_title" msgid="804365014499259673">"So de bloqueig de pantalla"</string>
-    <string name="audio_record_proc_title" msgid="486071779724181619">"Reducció del soroll"</string>
+    <string name="audio_record_proc_title" msgid="486071779724181619">"Cancel·lació de soroll"</string>
     <string name="volume_media_description" msgid="2736061076584067204">"Música, vídeos, jocs i altres fitxers multimèdia"</string>
     <string name="volume_ring_description" msgid="5423168446359881864">"So de trucada i notificacions"</string>
     <string name="volume_notification_description" msgid="3241009629930030492">"Notificacions"</string>
@@ -3959,7 +3963,7 @@
     <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Permet pantalla en pantalla"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Permet que aquesta aplicació creï una finestra de pantalla en pantalla mentre l\'aplicació està oberta o després de sortir-ne (per exemple, per seguir veient un vídeo). Aquesta finestra es mostra sobre altres aplicacions que estàs utilitzant."</string>
     <string name="interact_across_profiles_title" msgid="7285906999927669971">"Aplicacions de treball i personals connectades"</string>
-    <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"Connectada"</string>
+    <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"Connectats"</string>
     <string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"No connectada"</string>
     <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"No hi ha cap aplicació connectada"</string>
     <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"multiperfil aplicacions connectades aplicacions de treball i personals"</string>
@@ -4630,7 +4634,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Ús de dades mòbils"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Ús de dades de les aplicacions"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Ús de dades Wi-Fi"</string>
-    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ús de dades de xarxes sense operador"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ús de dades sense xarxa mòbil"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ús de dades Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e3ccef4..670ffdd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -859,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Tento kód PIN bude možná nutné zadat i v dalším zařízení."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Tento přístupový klíč bude možná nutné zadat i v druhém zařízení."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párování se zařízením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zkontrolujte, zda zařízení zobrazuje tento přístupový klíč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrďte párování s koordinovanou sadou"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ze zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Spárovat s tímto zařízením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Párování se zařízením:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Zadejte:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a poté stiskněte klávesu Return nebo Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povolit přístup ke kontaktům a historii volání"</string>
@@ -892,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nelze se připojit. Zkuste to znovu."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O zařízení"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth zařízení: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa Bluetooth zařízení:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zapomenout zařízení?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstranit přidružení"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Odpojit aplikaci?"</string>
@@ -924,6 +926,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamatovat nastavení"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum připojených audiozařízení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Vyberte maximální počet připojených audiozařízení Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Protokol ladění sady NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zvýšit úroveň protokolování sady NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Odesílání"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcadlení"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povolit bezdrátové zobrazení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3d03f03..18dffa7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Du skal muligvis også indtaste denne pinkode på den anden enhed."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Du skal muligvis også indtaste denne adgangsnøgle på den anden enhed."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sådan parrer du med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sørg for, at den viser denne adgangsnøgle:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekræft for at parre med det koordinerede sæt"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Par med denne enhed?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Sådan parres med:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv på den:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og tryk derefter på Retur eller Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Giv adgang til dine kontakter og din opkaldshistorik"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Det lykkedes ikke at oprette forbindelse. Prøv igen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhedsoplysninger"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhedens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhedens Bluetooth-adresse:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vil du glemme denne enhed?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjern tilknytning"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vil du fjerne tilknytningen til appen?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Husk indstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalt antal tilsluttede Bluetooth-lydenheder"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Vælg det maksimale antal Bluetooth-lydenheder, der kan tilsluttes"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Fejlretningslog for NFC-stakke"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Øg loggingsniveauet for NFC-stakke"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spejl"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivér trådløs skærm"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 28dbe61..546b6e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -828,6 +828,7 @@
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Eventuell musst du diesen Zugangscode auch auf dem anderen Gerät eingeben."</string>
     <!-- syntax error in translation for bluetooth_confirm_passkey_msg (327192310468680072) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:239 in     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Zur Kopplung mit:&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vergewissere dich, dass folgender Zugangscode angezeigt wird:<&lt;br&gt;&lt;b&gt;P<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
 )  -->
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bestätigen, um die Geräte in koordinierter Art und Weise zu koppeln"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Mit diesem Gerät koppeln?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Gib zur Kopplung mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücke anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zugriff auf meine Kontakte und meine Anrufliste zulassen"</string>
@@ -861,6 +862,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Verbindung konnte nicht hergestellt werden. Versuch es noch einmal."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Gerätedetails"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-Adresse des Geräts: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-Adresse des Geräts: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gerät entkoppeln?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Verknüpfung entfernen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"App-Verknüpfung aufheben?"</string>
@@ -893,6 +895,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Einstellungen speichern"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximale Zahl verbundener Bluetooth-Audiogeräte"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maximale Zahl verbundener Bluetooth-Audiogeräte auswählen"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-Stack-Debuggingprotokoll"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-Stack-Protokollierungsebene erhöhen"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Streamen"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spiegeln"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kabellose Übertragung aktivieren"</string>
@@ -2280,7 +2284,7 @@
     <string name="captions_category_title" msgid="574490148949400274">"Untertitel"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
     <string name="general_category_title" msgid="6298579528716834157">"Allgemein"</string>
-    <string name="display_category_title" msgid="6638191682294461408">"Bildschirm"</string>
+    <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text und Anzeige"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bildschirm dunkler machen"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Interaktionssteuerung"</string>
@@ -2671,10 +2675,10 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Höhere Akkunutzung"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Apps mit der höchsten Nutzung anzeigen"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Aufladen vorübergehend eingeschränkt"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Dadurch wird der Akku geschont. Weitere Informationen"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Dadurch wird der Akku geschont. \\nWeitere Informationen"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Ladevorgang fortsetzen"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Unter bestimmten Umständen, z. B. bei hohen Temperaturen und langen Ladezeiten, kann die Ladung auf <xliff:g id="PERCENT">%1$s</xliff:g> begrenzt sein, um den Akku zu schonen.\n\nSobald sich diese Umstände ändern, wird dein Smartphone wieder normal aufgeladen."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Unter bestimmten Umständen, z. B. bei hohen Temperaturen und langen Ladezeiten, kann die Ladung auf <xliff:g id="PERCENT">%1$s</xliff:g> begrenzt sein, um den Akkus zu schonen.\n\nSobald sich diese Umstände ändern, wird dein Tablet wieder normal aufgeladen."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Unter bestimmten Umständen, z. B. bei hohen Temperaturen und langen Ladezeiten, kann die Ladung auf <xliff:g id="PERCENT">%1$s</xliff:g> begrenzt werden, um den Akku zu schonen.\n\nSobald sich diese Umstände ändern, wird dein Smartphone wieder normal aufgeladen."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Unter bestimmten Umständen, z. B. bei hohen Temperaturen und langen Ladezeiten, kann die Ladung auf <xliff:g id="PERCENT">%1$s</xliff:g> begrenzt werden, um den Akku zu schonen.\n\nSobald sich diese Umstände ändern, wird dein Tablet wieder normal aufgeladen."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Dein Smartphone wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Dein Tablet wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Dein Gerät wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
@@ -2984,7 +2988,7 @@
     <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nicht zulassen"</string>
     <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Zulassen"</string>
     <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mehr anzeigen"</string>
-    <string name="certificate_management_app" msgid="8086699498358080826">"Zertifikatsver&amp;shy;waltungs-App"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Zertifikatsver­waltungs-App"</string>
     <string name="no_certificate_management_app" msgid="3025739370424406717">"Keine"</string>
     <string name="certificate_management_app_description" msgid="8507306554200869005">"Mit Zertifikaten wird deine Identität überprüft, wenn du die folgenden Apps und URLs verwendest"</string>
     <string name="uninstall_certs_credential_management_app" msgid="4945883254446077354">"Zertifikate deinstallieren"</string>
@@ -3785,7 +3789,7 @@
     <string name="snooze_options_title" msgid="2109795569568344617">"Schlummerfunktion für Benachrichtigungen zulassen"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Bei stummen Benachrichtigungen keine Symbole anzeigen"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Bei stummen Benachrichtigungen werden in der Statusleiste keine Symbole angezeigt"</string>
-    <string name="notification_badging_title" msgid="5469616894819568917">"Benachrichtigungspunkt auf App-Symbol"</string>
+    <string name="notification_badging_title" msgid="5469616894819568917">"Benachrich­ti­gungs­punkt auf App-Symbol"</string>
     <string name="notification_people_strip_title" msgid="1185857822541001139">"Leiste mit den neuesten Unterhaltungen anzeigen"</string>
     <string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"Bestimmte Benachrichtigungen und Inhalte können als \"Bubbles\" angezeigt werden. Tippe auf die Bubble, um sie zu öffnen. Wenn du sie wieder schließen möchtest, ziehe sie an den unteren Bildschirmrand."</string>
@@ -3801,11 +3805,11 @@
     <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"An / Unterhaltungen können als unverankerte Symbole angezeigt werden"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Zulassen, dass Apps Bubbles anzeigen"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Einige Unterhaltungen erscheinen als unverankerte Symbole über anderen Apps"</string>
-    <string name="bubble_app_setting_all" msgid="312524752846978277">"Alle Unterhaltungen können als Bubble angezeigt werden"</string>
-    <string name="bubble_app_setting_selected" msgid="4324386074198040675">"Ausgewählte Unterhaltungen können als Bubble angezeigt werden"</string>
-    <string name="bubble_app_setting_none" msgid="8643594711863996418">"Unterhaltungen können nicht als Bubble angezeigt werden"</string>
+    <string name="bubble_app_setting_all" msgid="312524752846978277">"Alle Unterhaltungen können als Bubble erscheinen"</string>
+    <string name="bubble_app_setting_selected" msgid="4324386074198040675">"Ausgewählte Unter­hal­tun­gen können als Bubble erscheinen"</string>
+    <string name="bubble_app_setting_none" msgid="8643594711863996418">"Unterhaltungen können nicht als Bubble erscheinen"</string>
     <string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"Unterhaltungen"</string>
-    <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"Alle Unterhaltungen können als Bubble angezeigt werden, außer"</string>
+    <string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"Alle Unterhaltungen können als Bubble erscheinen, außer"</string>
     <string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"Bubbles für diese Unterhaltung deaktivieren"</string>
     <string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"Bubbles für diese Unterhaltung aktivieren"</string>
     <string name="swipe_direction_title" msgid="4260320464727178413">"Aktionen beim Wischen"</string>
@@ -3828,7 +3832,7 @@
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sperrbildschirm, überspringen, umgehen"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Wenn das Arbeitsprofil gesperrt ist"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Benachrichtigungen auf Sperrbildschirm"</string>
-    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Lautlose und Standardunterhaltungen anzeigen"</string>
+    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Alle Benachrichtigungen anzeigen"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Lautlose Unterhaltungen und Benachrichtigungen verbergen"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Keine Benachrichtigungen anzeigen"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Vertrauliche Benachrichtigungen"</string>
@@ -4017,7 +4021,7 @@
     <string name="app_notification_block_summary" msgid="1804611676339341551">"Diese Benachrichtigungen nie anzeigen"</string>
     <string name="notification_content_block_title" msgid="6689085826061361351">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
-    <string name="notification_badge_title" msgid="6854537463548411313">"App-Benachrichtigungspunkt erlauben"</string>
+    <string name="notification_badge_title" msgid="6854537463548411313">"App-Benach­rich­ti­gungs­punkt erlauben"</string>
     <string name="notification_channel_badge_title" msgid="6505542437385640049">"App-Benachrichtigungs­punkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"„Bitte nicht stören“ ignorieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn „Bitte nicht stören“ aktiviert ist"</string>
@@ -4823,7 +4827,7 @@
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Neue Startbildschirmtaste ausprobieren"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Neue Touch-Geste zum Wechseln von Apps aktivieren"</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Sicherheit und Notfälle"</string>
-    <string name="emergency_dashboard_summary" msgid="401033951074039302">"Notfall-SOS, medizinische Informationen, Warnungen"</string>
+    <string name="emergency_dashboard_summary" msgid="401033951074039302">"Notfall-SOS, medizinische Informationen, Benachrichtigungen"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Bedienung über Gesten"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Öffne den Startbildschirm, indem du vom unteren Bildschirmrand nach oben wischst. Wenn du zwischen Apps wechseln möchtest, wische von unten nach oben, halte den Finger gedrückt und lass ihn dann los. Wenn du zurückgehen möchtest, wische vom linken oder vom rechten Rand nach innen."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"Bedienung über 3 Schaltflächen"</string>
@@ -5087,7 +5091,7 @@
     <string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Konto"</string>
     <string name="my_device_info_device_name_preference_title" msgid="8053298498727237971">"Gerätename"</string>
     <string name="my_device_info_basic_info_category_title" msgid="381963187269356548">"Allgemeine Informationen"</string>
-    <string name="my_device_info_legal_category_title" msgid="7732792841537995127">"Rechtliche und regulatorische Informationen"</string>
+    <string name="my_device_info_legal_category_title" msgid="7732792841537995127">"Rechtliche Informationen"</string>
     <string name="my_device_info_device_details_category_title" msgid="4848438695638348680">"Gerätedetails"</string>
     <string name="my_device_info_device_identifiers_category_title" msgid="2197063484127704153">"Geräte-IDs"</string>
     <string name="change_wifi_state_title" msgid="5629648102837821525">"WLAN-Steuerung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c002bab..6904268 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε αυτό το PIN στην άλλη συσκευή."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Επίσης, ενδέχεται να χρειαστεί να πληκτρολογήσετε το κλειδί πρόσβασης στην άλλη συσκευή."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Για σύζευξη με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Βεβαιωθείτε ότι εμφανίζεται το κλειδί πρόσβασης:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Επιβεβαίωση σύζευξης με συντονισμένο σύνολο συσκευών"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Από:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Να γίνει σύζευξη με αυτήν τη συσκευή;"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Για σύζευξη με:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Πληκτρολογήστε:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> και πιέστε το πλήκτρο επιστροφής (Return) ή το πλήκτρο Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Να επιτρέπεται η πρόσβαση στις επαφές σας και στο ιστορικό κλήσεων"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Δεν ήταν δυνατή η σύνδεση. Δοκιμάστε ξανά."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Λεπτομέρειες συσκευής"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Διεύθυνση Bluetooth συσκευής: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Διεύθυνση Bluetooth συσκευής:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Κατάργηση απομνημόνευσης συσκευής;"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Κατάργηση συσχέτισης"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Αποσύνδεση εφαρμογής;"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Διατήρηση ρυθμίσεων"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Μέγιστος αριθμός συνδεδεμένων συσκευών ήχου Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Επιλέξτε τον μέγιστο αριθμό συνδεδεμένων συσκευών ήχου Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Αρχείο καταγραφής εντοπισμού σφαλμάτων στοίβας NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Αύξηση επιπέδου καταγραφής στοίβας NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Μετάδοση"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"κατοπτρισμός"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ενεργοποίηση ασύρματης οθόνης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 414cea4..ff9d63a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f998aa8..9950ddd 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d46d4f9..df82231 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a19e681..150652a 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"You may also need to type this PIN on the other device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"You may also need to type this passkey on the other device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"To pair with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure that it is showing this passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirm to pair with the coordinated set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"To pair with:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Type on it:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, then press Return or Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Couldn\'t connect. Try again."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Device details"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Device\'s Bluetooth address: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Device\'s Bluetooth address:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Forget device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remove association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Disconnect app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Remember settings"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum connected Bluetooth audio devices"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Select maximum number of connected Bluetooth audio devices"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC stack debug log"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Increase NFC stack logging level"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Enable wireless display"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b2f7f98..665d6df 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎You may also need to type this PIN on the other device.‎‏‎‎‏‎"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎You may also need to type this passkey on the other device.‎‏‎‎‏‎"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎To pair with:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure it is showing this passkey:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="PASSKEY">%2$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;‎‏‎‎‏‎"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎Confirm to pair with the coordinated set‎‏‎‎‏‎"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎From:&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pair with this device?‎‏‎‎‏‎"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎To pair with:‎‏‎‎‏‏‎<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>‎‏‎‎‏‏‏‎Type on it:‎‏‎‎‏‏‎<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="PASSKEY">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>‎‏‎‎‏‏‏‎, then press Return or Enter.‎‏‎‎‏‎"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎Allow access to your contacts and call history‎‏‎‎‏‎"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎Couldn\'t connect. Try again.‎‏‎‎‏‎"</string>
     <string name="device_details_title" msgid="1155622417516195481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎Device details‎‏‎‎‏‎"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎Device\'s Bluetooth address: ‎‏‎‎‏‏‎<xliff:g id="ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎Device\'s Bluetooth address:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="ADDRESS">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎Forget device?‎‏‎‎‏‎"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎Remove association‎‏‎‎‏‎"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎Disconnect App?‎‏‎‎‏‎"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎Remember settings‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎Maximum connected Bluetooth audio devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎Select maximum number of connected Bluetooth audio devices‎‏‎‎‏‎"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎NFC stack debug log‎‏‎‎‏‎"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎Increase NFC stack logging level‎‏‎‎‏‎"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎Cast‎‏‎‎‏‎"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎mirror‎‏‎‎‏‎"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎Enable wireless display‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1e4949f..eb27cd7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Puede que también tengas que escribir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Puede que también tengas que escribir esta clave de acceso en otro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para vincular con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asegúrate de que se muestre esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma para vincular con el conjunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"¿Desde: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sincronizas con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para vincular con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe allí:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> y luego presiona Volver o Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir el acceso a tus contactos y al historial de llamadas"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No se pudo establecer la conexión. Vuelve a intentarlo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalles del dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Dirección Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Dirección Bluetooth del dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"¿Olvidar este dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Quitar asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"¿Quieres desconectar la app?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Recordar la configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona una cantidad máxima de dispositivos de audio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuración de la pila de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta el nivel de acceso a la pila de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplicar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
@@ -1192,7 +1196,7 @@
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del PA"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Los hotspots brindan acceso a Internet mediante una conexión de datos móviles. Configura uno a fin de crear una red Wi‑Fi para otros dispositivos. Es posible que se apliquen cargos por el uso de datos móviles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Desactivar el hotspot de manera automática"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Desactivar hotspot automáticamente"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Cuando no hay dispositivos conectados"</string>
     <string name="wifi_hotspot_maximize_compatibility" msgid="6494125684420024058">"Extender la compatibilidad"</string>
     <string name="wifi_hotspot_maximize_compatibility_single_ap_summary" msgid="383355687431591441">"Ayuda a que otros dispositivos encuentren este hotspot. Disminuye la velocidad de conexión de hotspot."</string>
@@ -1887,7 +1891,7 @@
     <string name="location_access_summary" msgid="8634100005481578143">"Permitir que las aplicaciones que solicitaron permiso usen la información de tu ubicación"</string>
     <string name="location_sources_heading" msgid="6126965815860570524">"Fuentes de ubicación"</string>
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"Acerca de la tablet"</string>
-    <string name="about_settings" product="default" msgid="4038626127378127613">"Acerca del dispositivo"</string>
+    <string name="about_settings" product="default" msgid="4038626127378127613">"Acerca del teléfono"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"Acerca del dispositivo"</string>
     <string name="about_settings" product="emulator" msgid="2516560858771320366">"Acerca del dispositivo emulado"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Ver información legal, estado, versión de software del tablet"</string>
@@ -3343,7 +3347,7 @@
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"¿Eliminar invitado?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Se eliminarán las aplicaciones y los datos de esta sesión."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Eliminar"</string>
-    <string name="user_enable_calling" msgid="264875360626905535">"Activar llamadas de teléfono"</string>
+    <string name="user_enable_calling" msgid="264875360626905535">"Activar llamadas telefónicas"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activar llamadas telefónicas y SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Borrar usuario"</string>
     <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"¿Activar llamadas telefónicas?"</string>
@@ -4639,7 +4643,7 @@
     <string name="cell_data_template" msgid="6077963976103260821">"Datos móviles: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="935934798340307438">"Datos de Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="1429173767445201145">"Datos de Ethernet: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
-    <string name="billing_cycle" msgid="6618424022653876279">"Límite y advertencia de datos"</string>
+    <string name="billing_cycle" msgid="6618424022653876279">"Advertencia de límite de datos"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"Ciclo de uso de datos móviles"</string>
     <string name="cell_data_warning" msgid="5664921950473359634">"Advertencia de datos: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="256855024790622112">"Límite de datos: <xliff:g id="ID_1">^1</xliff:g>"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7bf847f..1a6d5a4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Es posible que tengas que introducir la clave de acceso en el otro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para emparejar con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Comprueba que se muestre la clave:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma para emparejar con el conjunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;¿Emparejar con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para emparejar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en el dispositivo y, a continuación, pulsa la tecla Intro o de retorno."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acceso a tus contactos y al historial de llamadas"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"No se ha podido establecer conexión. Vuelve a intentarlo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalles del dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Dirección de Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Dirección de Bluetooth del dispositivo: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"¿Olvidar dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Deshacer asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"¿Desconectar aplicación?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ajustes de recordatorio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de audio conectados por Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona el número máximo de dispositivos de audio conectados por Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuración de la pila de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta la cantidad de información que se registra de la pila de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Enviar"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proyectar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
@@ -936,7 +940,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar conexión Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizar Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ajustes de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar y administrar puntos de acceso inalámbricos"</string>
@@ -2011,7 +2015,7 @@
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="6276915393736137843">"Usar un único bloqueo"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8509287115116369677">"Usar un único bloqueo"</string>
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Igual que el bloqueo de pantalla del dispositivo"</string>
-    <string name="manageapplications_settings_title" msgid="9198876415524237657">"Administrar aplicaciones"</string>
+    <string name="manageapplications_settings_title" msgid="9198876415524237657">"Gestionar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"Administrar y quitar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="1941993743933425622">"Información de las aplicaciones"</string>
     <string name="applications_settings_summary" msgid="8206066893744768531">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
@@ -2295,7 +2299,7 @@
     <string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"Amplía toda la pantalla, una parte concreta o cambia entre ambas opciones"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="9191632962955877019">"Pantalla parcial"</string>
-    <string name="accessibility_magnification_area_settings_all_summary" msgid="8107511976748799455">"Cambiar entre pantalla completa y parcial"</string>
+    <string name="accessibility_magnification_area_settings_all_summary" msgid="8107511976748799455">"Cambia entre pantalla completa y parcial"</string>
     <string name="accessibility_magnification_mode_dialog_title" msgid="9151027667059878578">"Elige cómo quieres ampliar"</string>
     <string name="accessibility_magnification_mode_dialog_option_full_screen" msgid="4892487869954032029">"Ampliar pantalla completa"</string>
     <string name="accessibility_magnification_mode_dialog_option_window" msgid="4492443201099153362">"Ampliar parte de la pantalla"</string>
@@ -2314,7 +2318,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Amplía la pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Toca tres veces para hacer zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botón para ampliar"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Haz zoom en la pantalla para ver el contenido más grande.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Para ampliarla:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Usa el acceso directo para iniciar la función de lupa.&lt;br/&gt; {1,number,integer}. Toca la pantalla.&lt;br/&gt; {2,number,integer}. Arrastra dos dedos para moverte por la pantalla.&lt;br/&gt; {3,number,integer}. Pellizca con dos dedos para ajustar el zoom.&lt;br/&gt; {4,number,integer}. Usa el acceso directo para detener la función de lupa.&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Si quieres ampliar contenido de forma temporal, sigue estos pasos:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Usa el acceso directo para iniciar la función de lupa.&lt;br/&gt; {1,number,integer}. Mantén pulsado cualquier punto de la pantalla.&lt;br/&gt; {2,number,integer}. Arrastra el dedo para moverte por la pantalla.&lt;br/&gt; {3,number,integer}. Levanta el dedo para detener la función de lupa."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"Haz zoom en la pantalla para ver el contenido más grande.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Para ampliarla:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Usa el acceso directo para iniciar la ampliación.&lt;br/&gt; {1,number,integer}. Toca la pantalla.&lt;br/&gt; {2,number,integer}. Arrastra dos dedos para moverte por la pantalla.&lt;br/&gt; {3,number,integer}. Pellizca con dos dedos para ajustar el zoom.&lt;br/&gt; {4,number,integer}. Usa el acceso directo para detener la ampliación.&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Para ampliarla de forma temporal:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Usa el acceso directo para iniciar la ampliación.&lt;br/&gt; {1,number,integer}. Mantén pulsado cualquier punto de la pantalla.&lt;br/&gt; {2,number,integer}. Arrastra el dedo para moverte por la pantalla.&lt;br/&gt; {3,number,integer}. Levanta el dedo para detener la ampliación."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Si la ampliación está activada, puedes ampliar la pantalla.\n\n"<b>"Para ampliar"</b>", inicia la ampliación y toca la parte de la pantalla que quieras ampliar.\n"<ul><li>"Arrastra al menos dos dedos para desplazarte."</li>\n<li>"Pellizca la pantalla con al menos dos dedos para ajustar el zoom."</li></ul>\n\n<b>"Para ampliar elementos temporalmente"</b>", inicia la ampliación y mantén pulsada cualquier parte de la pantalla.\n"<ul><li>"Arrastra un dedo para desplazarte por la pantalla."</li>\n<li>"Levanta el dedo para reducir la imagen."</li></ul>\n\n"El teclado y la barra de navegación no se pueden ampliar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Usa el botón Accesibilidad para abrir"</string>
@@ -2668,10 +2672,10 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Mayor uso de batería"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Consulta las aplicaciones que consumen más batería"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Carga limitada temporalmente"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para ahorrar batería. Más información"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para conservar la salud de la batería. Más información"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Seguir cargando"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"En determinadas circunstancias (por ejemplo, cuando hay altas temperaturas o si lleva mucho tiempo cargándose), el teléfono solo se puede cargar hasta el <xliff:g id="PERCENT">%1$s</xliff:g> para preservar el estado de su batería.\n\nUna vez que dejen de darse estas circunstancias, el teléfono se cargará de nuevo con normalidad."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"En determinadas circunstancias (por ejemplo, cuando hay altas temperaturas o si lleva mucho tiempo cargándose), el tablet solo se puede cargar hasta el <xliff:g id="PERCENT">%1$s</xliff:g> para preservar el estado de su batería.\n\nUna vez que dejen de darse estas circunstancias, el tablet se cargará de nuevo con normalidad."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"En determinadas circunstancias (por ejemplo, cuando la temperatura es alta o va a estar mucho tiempo  conectado al cargador), el teléfono puede limitar la carga hasta el <xliff:g id="PERCENT">%1$s</xliff:g> para mantener la salud de la batería.\n\nUna vez que dejen de darse estas circunstancias, el teléfono se cargará de nuevo con normalidad."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"En determinadas circunstancias (por ejemplo, cuando la temperatura es alta o va a estar mucho tiempo  conectado al cargador), el tablet puede limitar la carga hasta el <xliff:g id="PERCENT">%1$s</xliff:g> para mantener la salud de la batería.\n\nUna vez que dejen de darse estas circunstancias, el tablet se cargará de nuevo con normalidad."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Como has usado tu teléfono más de lo normal, es posible que te quedes sin batería antes de lo habitual.\n\nAplicaciones que consumen más batería:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Como has usado tu tablet más de lo normal, es posible que te quedes sin batería antes de lo habitual.\n\nAplicaciones que consumen más batería:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Como has usado tu dispositivo más de lo normal, es posible que te quedes sin batería antes de lo habitual.\n\nAplicaciones que consumen más batería:"</string>
@@ -2948,12 +2952,12 @@
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> no son seguras"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad adaptativa"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Alarga la duración de la batería y mejora el rendimiento del dispositivo gestionando automáticamente las conexiones de red"</string>
-    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activar"</string>
-    <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Desactivar"</string>
+    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activado"</string>
+    <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Desactivado"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar certificados"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instala certificados desde el almacenamiento"</string>
-    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Instalar certificados desde la tarjeta SD"</string>
+    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Instala certificados desde la tarjeta SD"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"Borrar credenciales"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Quita todos los certificados"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Credenciales de confianza"</string>
@@ -3832,7 +3836,7 @@
     <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"Mostrar contenido sensible en la pantalla de bloqueo"</string>
     <string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"Notificaciones sensibles del perfil de trabajo"</string>
     <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Mostrar contenido sensible del perfil de trabajo en la pantalla de bloqueo"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"Mostrar todo el contenido de las notificaciones"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"Muestra todo el contenido de las notificaciones"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"Mostrar contenido sensible solo al desbloquear"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"No mostrar ninguna notificación"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4688399629301178487">"¿Cómo quieres que se muestren las notificaciones en la pantalla de bloqueo?"</string>
@@ -4265,7 +4269,7 @@
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> usados en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"almacenamiento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"almacenamiento externo"</string>
-    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="SIZE">%1$s</xliff:g> usados desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="SIZE">%1$s</xliff:g> usados desde el <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="2591194906751432725">"Almacenamiento usado"</string>
     <string name="change" msgid="273206077375322595">"Cambiar"</string>
     <string name="change_storage" msgid="8773820275624113401">"Cambiar almacenamiento"</string>
@@ -4816,7 +4820,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"Hacer selfies más rápido"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"Navegación del sistema"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navegación con 2 botones"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para cambiar de aplicación, desliza el dedo hacia arriba desde el botón de inicio. Para ver todas las aplicaciones, vuelve a deslizar el dedo hacia arriba. Para ir atrás, toca el botón Atrás."</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para cambiar de aplicación, desliza hacia arriba desde el botón de inicio. Para ver todas las aplicaciones, vuelve a deslizar hacia arriba. Para ir atrás, toca el botón Atrás."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Prueba el nuevo botón de inicio"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Activa el nuevo gesto para cambiar de aplicación"</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Seguridad y emergencias"</string>
@@ -5538,7 +5542,7 @@
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
     <string name="enable_2g_title" msgid="8184757884636162942">"Permitir el 2G"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"Usar conexiones móviles 2G. En las llamadas de emergencia, el 2G siempre está activado."</string>
-    <string name="show_clip_access_notification" msgid="7782300987639778542">"Mostrar que se accede al portapapeles"</string>
+    <string name="show_clip_access_notification" msgid="7782300987639778542">"Mostrar acceso al portapapeles"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Muestra un mensaje cuando las aplicaciones acceden a texto, imágenes u otro contenido que has copiado"</string>
     <string name="all_apps" msgid="3054120149509114789">"Todas las aplicaciones"</string>
     <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"No permitir"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 612adcc..69c5e27 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Võib-olla peate selle PIN-koodi sisestama ka teise seadmesse."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Võib-olla peate selle parooli sisestama ka teise seadmesse."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sidumine seadmega&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Veenduge, et see kuvaks järgmist parooli:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Kinnitage koordineeritud komplektiga sidumiseks"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Seadmelt: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Kas siduda seadmega?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Siduda seadmega:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sisestage:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, seejärel vajutage naasmis- või sisestusklahvi."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Luba juurdepääs kontaktidele ja kõneajaloole"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ühendust ei õnnestunud luua. Proovige uuesti."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Seadme üksikasjad"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Seadme Bluetoothi aadress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Seadme Bluetoothi aadress:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Kas unustada seade?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Eemalda seos"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Kas katkestada rakenduse ühendus?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Jäta seaded meelde"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimaalne arv ühendatud Bluetoothi heliseadmeid"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimaalse arvu ühendatud Bluetoothi heliseadmete valimine"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC virna silumise logi"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC virna logimise taseme suurendamine"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Ülekandmine"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peegeldamine"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Luba juhtmeta ekraaniühendus"</string>
@@ -1889,7 +1893,7 @@
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"Teave tahvelarvuti kohta"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"Telefoni teave"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"Teave seadme kohta"</string>
-    <string name="about_settings" product="emulator" msgid="2516560858771320366">"Teave jäljendatud seadme kohta"</string>
+    <string name="about_settings" product="emulator" msgid="2516560858771320366">"Teave emuleeritud seadme kohta"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Vaadake juriidilist teavet, olekut, tarkvara versiooni"</string>
     <string name="legal_information" msgid="7509900979811934843">"Juriidiline teave"</string>
     <string name="contributors_title" msgid="7965640251547037965">"Kaasautorid"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8a86629..c2628de 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Baliteke PIN hau beste gailuan ere idatzi behar izatea."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Baliteke pasahitz hau beste gailuan ere idatzi behar izatea."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Gailu honekin parekatzeko:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ziurtatu pasakode hau erakusten duela:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Berretsi multzo koordinatuarekin parekatzeko"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Igorlea:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gailuarekin parekatu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Honekin parekatzeko:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Idatzi hau bertan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, eta sakatu Itzuli edo Sartu."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Eman kontaktuak eta deien historia erabiltzeko baimena"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ezin izan da konektatu. Saiatu berriro."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Gailuaren xehetasunak"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Gailua Bluetooth bidez konektatzeko helbidea: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Gailua Bluetooth bidez konektatzeko helbidea: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gailua ahaztu nahi duzu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Kendu erlazioa"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Aplikazioa deskonektatu nahi duzu?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Gogoratu ezarpenak"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Gehienez ere konekta daitezkeen Bluetooth bidezko audio-gailuak"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Hautatu gehienez ere konekta daitezkeen Bluetooth bidezko audio-gailuak"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFCaren pilatzea arazteko erregistroa"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Handitu NFCaren pilatzearen erregistro-maila"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Igorpena"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"islatzea"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Gaitu hari gabeko bistaratzea"</string>
@@ -1047,7 +1051,7 @@
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" sarean sartzeko, eskaneatu QR kode hau beste gailu batekin"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Saiatu berriro. Arazoak badirau, jarri gailuaren fabrikatzailearekin harremanetan."</string>
-    <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Arazoren bat izan da"</string>
+    <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Arazo bat izan da"</string>
     <string name="wifi_dpp_failure_timeout" msgid="7902971341771145564">"Ziurtatu gailua entxufatuta, kargatuta eta piztuta dagoela"</string>
     <string name="wifi_dpp_failure_generic" msgid="6559442892600448442">"Ziurtatu gailua entxufatuta, kargatuta eta piztuta dagoela. Arazoak badirau, jarri gailuaren fabrikatzailearekin harremanetan."</string>
     <string name="wifi_dpp_failure_not_supported" msgid="2908961523550486480">"Ezin da gehitu \"<xliff:g id="SSID">%1$s</xliff:g>\" gailu honetan"</string>
@@ -1550,7 +1554,7 @@
     <string name="memory_music_usage" msgid="8100634000114206429">"Audioa (musika, tonuak, podcastak eta abar)"</string>
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"Beste fitxategi batzuk"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"Cachean gordetako datuak"</string>
-    <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"Desmuntatu partekatutako memoria"</string>
+    <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"Desmuntatu biltegi partekatua"</string>
     <string name="sd_eject" product="default" msgid="8062832622096296251">"Desmuntatu SD txartela"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"Desmuntatu barneko USB memoria"</string>
     <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"Desmuntatu SD txartela, kentzeko prest egon dadin"</string>
@@ -2898,7 +2902,7 @@
     <string name="process_stats_type_cached" msgid="129788969589599563">"Cachean gordeta"</string>
     <string name="process_stats_os_label" msgid="2096501347732184886">"Android sistema eragilea"</string>
     <string name="process_stats_os_native" msgid="794547105037548539">"Natiboa"</string>
-    <string name="process_stats_os_kernel" msgid="5626269994512354996">"Kernela"</string>
+    <string name="process_stats_os_kernel" msgid="5626269994512354996">"Kernel-a"</string>
     <string name="process_stats_os_zram" msgid="3067278664868354143">"Z-Ram"</string>
     <string name="process_stats_os_cache" msgid="4753163023524305711">"Cacheak"</string>
     <string name="process_stats_ram_use" msgid="5966645638783509937">"RAM erabilera"</string>
@@ -5267,7 +5271,7 @@
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM txartela desaktibatu nahi duzu?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM txartela desaktibatzen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ezin da desgaitu operadorea"</string>
-    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazoren bat izan da, eta ezin izan da desgaitu operadorea."</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazo bat izan da, eta ezin izan da desgaitu operadorea."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Bi SIM erabili nahi dituzu?"</string>
     <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Gailu honek bi SIM izan ditzake aktibo aldi berean. SIM bakarra erabili nahi baduzu, sakatu \"Ez\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Gailua berrabiarazi nahi duzu?"</string>
@@ -5309,7 +5313,7 @@
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak aldi baterako wifi-sare bat erabili nahi du zure gailura konektatzeko"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ez da aurkitu gailurik. Ziurtatu gailuak piztuta daudela eta konekta daitezkeela."</string>
     <string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Saiatu berriro"</string>
-    <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Arazoren bat izan da. Aplikazioak bertan behera utzi du gailu bat aukeratzeko eskaera."</string>
+    <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Arazo bat izan da. Aplikazioak bertan behera utzi du gailu bat aukeratzeko eskaera."</string>
     <string name="network_connection_connect_successful" msgid="2587314077675642476">"Konektatu da"</string>
     <string name="network_connection_connect_failure" msgid="6803313816657494319">"Ezin izan da konektatu"</string>
     <string name="network_connection_request_dialog_showall" msgid="6392059758456994944">"Erakutsi guztiak"</string>
@@ -5423,7 +5427,7 @@
     <string name="no_5g_in_dsds_text" product="default" msgid="772747677303920132">"Bi SIM txartel darabiltzanean, telefonoak 4G sarea erabili ahal izango du, gehienez. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
     <string name="no_5g_in_dsds_text" product="tablet" msgid="4757328474425714624">"Bi SIM txartel darabiltzanean, tabletak 4G sarea erabili ahal izango du, gehienez. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
     <string name="no_5g_in_dsds_text" product="device" msgid="6983783505032683314">"Bi SIM txartel darabiltzanean, gailuak 4G sarea erabili ahal izango du, gehienez. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
-    <string name="cached_apps_freezer" msgid="1057519579761550350">"Eten cacheko aplikazioen exekuzioa"</string>
+    <string name="cached_apps_freezer" msgid="1057519579761550350">"Utzi cacheko aplikazioak exekutatzeari"</string>
     <string name="overlay_settings_title" msgid="1032863083496396365">"Eman pantailetan gainjartzeko baimena ezarpenetan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Eman ezarpenen pantailetan gainjartzeko baimena aplikazioen gainean bistara daitezkeen aplikazioei"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia-edukia"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e387d00..bf9d01d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ممکن است لازم باشد که این پین را در دستگاه دیگری وارد کنید."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ممکن است لازم باشد این کلیدواژه را نیز در دستگاه دیگر وارد کنید."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏برای مرتبط‌سازی با:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;مطمئن شوید که دستگاه این کلیدواژه را نمایش می‌دهد:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"تأیید مرتبط‌سازی با مجموعه هماهنگ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏از::&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;با این دستگاه مرتبط‌سازی شود؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏برای مرتبط‌سازی با:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>روی آن تایپ کنید:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>، سپس Return یا Enter را فشار دهید."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اجازه دسترسی به مخاطبین و سابقه تماس"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"متصل نشد. دوباره امتحان کنید."</string>
     <string name="device_details_title" msgid="1155622417516195481">"جزئیات دستگاه"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"نشانی بلوتوث دستگاه: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"نشانی بلوتوث دستگاه:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"دستگاه فراموش شود؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"حذف ارتباط"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ارتباط برنامه قطع شود؟"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"به خاطر سپردن تنظیمات"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"حداکثر تعداد دستگاه‌های صوتی بلوتوث متصل را انتخاب کنید"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏گزارش اشکال‌زدایی پشته‌ای NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏افزایش سطح گزارش‌گیری پشته‌ای NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ارسال محتوا"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"نمایش صفحه نمایش روی دستگاه دیگر"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"فعال کردن نمایش بی‌سیم"</string>
@@ -1134,9 +1138,9 @@
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"‏Wi-Fi پیشرفته"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
-    <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏نشانی MAC دستگاه"</string>
-    <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏نشانی MAC تصادفی"</string>
-    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‏نشانی MAC تصادفی (آخرین استفاده)"</string>
+    <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"«نشانی واد» دستگاه"</string>
+    <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"«نشانی واد» تصادفی"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"«نشانی واد» تصادفی (آخرین استفاده)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏نشانی IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"پوشش زیرشبکه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 959aa52..ac4debe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Saatat joutua syöttämään tämän PIN-koodin myös toiseen laitteeseen."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Saatat joutua syöttämään tämän koodin myös toiseen laitteeseen."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Parin muodostus seuraavan laitteen kanssa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Varmista, että laite esittää tämän koodin:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Vahvista laiteparin muodostus koordinoidun joukon kanssa"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Laitteesta&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Muodostetaanko pari tämän laitteen kanssa?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Jos haluat muodostaa laiteparin laitteen <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> kanssa, kirjoita laitteelle <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ja paina Rivinvaihto tai Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Anna yhteystietojesi ja puheluhistoriasi käyttöoikeus"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Yhteyttä ei voi muodostaa. Yritä uudelleen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Laitteen tiedot"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Laitteen Bluetooth-osoite: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Laitteen Bluetooth-osoite: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Unohdetaanko laite?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Poista yhteys"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Katkaistaanko sovelluksen yhteys?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Muista asetukset"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Valitse liitettyjen Bluetooth-äänilaitteiden enimmäismäärä"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-pinon viankorjausloki"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Nosta NFC-pinon lokikirjaustasoa"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Lähetä"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"peilaus"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ota langaton näyttö käyttöön"</string>
@@ -976,7 +980,7 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Vaihda mobiilidataan, jos Wi-Fi-yhteyttä ei voi muodostaa. Datan käytöstä voi aiheutua maksuja."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Lisää verkko"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wi-Fi-asetukset"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi-Fi otetaan uudelleen käyttöön automaattisesti."</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi-Fi otetaan uudelleen käyttöön automaattisesti"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi-Fiä ei oteta uudelleen käyttöön automaattisesti."</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"Wi-Fi-verkot"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Lisää asetuksia"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 000af66..b7cc0bf 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -299,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="one">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à la position</item>
-      <item quantity="other">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à la position</item>
+      <item quantity="one">Activée : <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à la position</item>
+      <item quantity="other">Activée : <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à la position</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement en cours…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Les applications qui disposent de l\'autorisation de détection des appareils à proximité peuvent déterminer la position relative des appareils connectés."</string>
@@ -473,7 +473,7 @@
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"Le capteur d\'empreintes digitales se trouve sur votre écran. Vous capturerez votre empreinte digitale au prochain écran."</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"Démarrer"</string>
     <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Déplacez votre doigt sur l\'écran pour trouver le capteur. Maintenez le doigt sur le capteur d\'empreintes digitales."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration présentant l\'appareil et la position du capteur d\'empreinte digitale"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration présentant l\'appareil et la position du capteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Supprimer"</string>
@@ -556,7 +556,7 @@
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" L\'option de verrouillage de l\'écran est désactivée. Pour en savoir plus, communiquez avec l\'administrateur de votre organisation. "<annotation id="admin_details">"Plus de détails"</annotation>\n\n"Vous pouvez toujours utiliser votre empreinte digitale pour autoriser les achats et l\'accès aux applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Relevez le doigt, puis touchez le capteur à nouveau"</string>
-    <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Impossible utiliser capteur empreinte digitale. Consultez un fournisseur de services de réparation"</string>
+    <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"Impossible utiliser capteur empreintes digitales. Consultez un fournisseur de services de réparation"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Vous avez ajouté le nombre maximal d\'empreintes digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"Impossible d\'ajouter des empreintes digitales"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Vous devrez peut-être également saisir ce NIP sur l\'autre appareil."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmez pour effectuer l\'association avec l\'ensemble coordonné"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pour l\'association à :<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisissez <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, puis appuyez sur « Retour » ou sur « Entrée »."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique des appels"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Échec de la connexion. Réessayez."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Détails de l\'appareil"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresse Bluetooth de l\'appareil :\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Oublier l\'appareil?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Retirer l\'association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Déconnecter l\'application?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Sélectionnez le nombre maximal d\'appareils Bluetooth connectés"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Journal de débogage de la pile de la CCP"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Accroître le niveau de journalisation de la pile de la CCP"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"miroir"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Recharge temporairement limitée"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Pour préserver votre pile. Apprenez-en plus."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Reprendre la charge"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prennent fin, votre téléphone se chargera normalement de façon automatique."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prennent fin, votre tablette se chargera normalement de façon automatique."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prendront fin, votre téléphone se rechargera normalement de façon automatique."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prendront fin, votre tablette se rechargera normalement de façon automatique."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Comme vous avez utilisé votre téléphone plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Comme vous avez utilisé votre tablette plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Comme vous avez utilisé votre appareil plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
@@ -2948,7 +2952,7 @@
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> non sécurisés"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivité adaptative"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonge l\'autonomie de la pile et améliore la performance de l\'appareil en gérant automatiquement vos connexions réseau"</string>
-    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activé"</string>
+    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activée"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Désactivé"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stockage des authentifiants"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer un certificat"</string>
@@ -3795,7 +3799,7 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"L\'activation des bulles pour cette application activera aussi les bulles pour votre appareil.\n\nCela a un impact sur les autres applications ou les conversations qui peuvent s\'afficher en bulles."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"Activer"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"Annuler"</string>
-    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Activé : les conversations peuvent s\'afficher sous forme d\'icônes flottantes"</string>
+    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Activées : les conversations peuvent s\'afficher sous forme d\'icônes flottantes"</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Autoriser les applications à afficher des bulles"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Certaines conversations s\'afficheront sous forme d\'icônes flottantes superposées aux autres applications"</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"Toutes les conversations peuvent s\'afficher dans des bulles"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bebc758..dc45e47 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -49,7 +49,7 @@
     <string name="sdcard_format" product="default" msgid="3676635435136326182">"Formater la carte SD"</string>
     <string name="preview_pager_content_description" msgid="3762247188224576303">"Aperçu"</string>
     <string name="preview_page_indicator_content_description" msgid="2790254666634885865">"Aperçu, page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="font_size_summary" msgid="1296835853522566260">"Agrandir ou réduire la taille du texte à l\'écran."</string>
+    <string name="font_size_summary" msgid="1296835853522566260">"Agrandissez ou réduisez la taille du texte affiché."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Réduire"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Agrandir"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3151963020165952847">"Utiliser la rotation automatique"</string>
@@ -616,7 +616,7 @@
     <string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="1040265358906410746"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="1040265358906410746"></string>
     <string name="lock_settings_picker_title" msgid="9219376327364915334">"Verrouillage de l\'écran"</string>
-    <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Choisir le verrouillage"</string>
+    <string name="lock_settings_picker_new_lock_title" msgid="3113042086804290919">"Choisir le verrouillage de l\'écran"</string>
     <string name="lock_settings_picker_update_lock_title" msgid="536853138943415927">"Choisir un nouveau verrouillage d\'écran"</string>
     <string name="lock_settings_picker_new_profile_lock_title" msgid="2270462215256413800">"Choisir le verrouillage des applis pro"</string>
     <string name="lock_settings_picker_update_profile_lock_title" msgid="5929068163516308927">"Choisir un nouveau verrouillage de profil pro"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Vous devrez peut-être également saisir ce code sur l\'autre appareil."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Vous devrez peut-être également saisir ce mot de passe sur l\'autre appareil."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pour associer votre appareil à :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assurez-vous que le mot de passe &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; s\'affiche."</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmez pour associer à l\'ensemble coordonné"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Associer à cet appareil ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pour l\'association à :<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Saisissez <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, puis appuyez sur \"Retour\" ou sur \"Entrée\"."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique des appels"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Impossible de se connecter. Réessayez."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Infos sur l\'appareil"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresse Bluetooth de l\'appareil : <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresse Bluetooth de l\'appareil :\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Oublier l\'appareil ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Supprimer l\'association"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Dissocier l\'appli ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Mémoriser ces paramètres"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Nombre maximal d\'appareils audio Bluetooth connectés"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Sélectionner le nombre maximal d\'appareils audio Bluetooth connectés"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Journal de débogage des piles NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Accroître le niveau de journalisation des piles NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"duplication d\'écran"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activer l\'affichage sans fil"</string>
@@ -1437,7 +1441,7 @@
     <string name="force_bold_text" msgid="4620929631102086716">"Texte en gras"</string>
     <string name="title_font_size" msgid="570613010306330622">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Agrandir ou réduire le texte"</string>
-    <string name="sim_lock_settings" msgid="4493069398250139205">"Verrouillage SIM"</string>
+    <string name="sim_lock_settings" msgid="4493069398250139205">"Paramètres de verrouillage SIM"</string>
     <string name="sim_lock_settings_category" msgid="4280307997492851625">"Verrouillage de la carte SIM"</string>
     <string name="sim_lock_settings_summary_off" msgid="4570941250786847095">"Désactivé"</string>
     <string name="sim_lock_settings_summary_on" msgid="1562184566830887925">"Verrouillée"</string>
@@ -2292,7 +2296,7 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Préférences pour les sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Agrandissement"</string>
     <string name="accessibility_magnification_mode_title" msgid="8446475127807168063">"Type d\'agrandissement"</string>
-    <string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"Agrandir tout ou partie de l\'écran, ou basculer entre ces deux options"</string>
+    <string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"Agrandissez tout ou partie de l\'écran, ou basculez entre ces deux options"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tout l\'écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="9191632962955877019">"Une partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="8107511976748799455">"Passer du plein écran à une partie de l\'écran"</string>
@@ -2300,7 +2304,7 @@
     <string name="accessibility_magnification_mode_dialog_option_full_screen" msgid="4892487869954032029">"Agrandir tout l\'écran"</string>
     <string name="accessibility_magnification_mode_dialog_option_window" msgid="4492443201099153362">"Agrandir une partie de l\'écran"</string>
     <string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"Passer du plein écran à une partie de l\'écran"</string>
-    <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"Appuyer sur le bouton pour passer d\'une option à l\'autre"</string>
+    <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"Appuyez sur le bouton pour passer d\'une option à l\'autre"</string>
     <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton Accessibilité ?"</string>
     <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"Appuyer trois fois pour agrandir une partie de l\'écran entraîne une latence, lors de la saisie par exemple.\n\nLe bouton Accessibilité flotte par-dessus les autres applis. Appuyez dessus pour agrandir."</string>
     <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton Accessibilité"</string>
@@ -2389,7 +2393,7 @@
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"2 minutes"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"Temps pour réagir (accessibilité)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Temps pour réagir"</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Choisissez pendant combien de temps doivent rester affichés les messages temporaires qui vous invitent à agir.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Choisissez la durée d\'affichage des messages temporaires qui vous invitent à agir.\n\nCertaines applications ne sont pas compatibles avec ce paramètre."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Délai de l’appui prolongé"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Inversion des couleurs"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Utiliser l\'inversion des couleurs"</string>
@@ -2488,7 +2492,7 @@
     <string name="accessibility_vibration_intensity_high" msgid="5982896399775212514">"Fort"</string>
     <string name="accessibility_menu_item_settings" msgid="2652637954865389271">"Paramètres"</string>
     <string name="accessibility_feature_state_on" msgid="1777344331063467511">"Activé"</string>
-    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Désactivé"</string>
+    <string name="accessibility_feature_state_off" msgid="169119895905460512">"Désactivée"</string>
     <string name="captioning_preview_title" msgid="2888561631323180535">"Aperçu"</string>
     <string name="captioning_standard_options_title" msgid="5360264497750980205">"Options standards"</string>
     <string name="captioning_locale" msgid="5533303294290661590">"Langue"</string>
@@ -3641,7 +3645,7 @@
     <string name="live_caption_summary" msgid="2898451867595161809">"Sous-titres automatiques"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucun}=1{1 programme défini}one{# programme défini}other{# programmes définis}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
-    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ne recevoir des notifications que des personnes et applications importantes"</string>
+    <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et applications importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
     <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activer le mode Ne pas déranger"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Les alarmes et les sons des contenus multimédias peuvent interrompre le mode Ne pas déranger"</string>
@@ -3770,7 +3774,7 @@
     <string name="asst_importance_reset_summary" msgid="684794589254282667">"Réinitialiser les paramètres d\'importance modifiés par l\'utilisateur et autoriser l\'assistant de notifications à les hiérarchiser"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Actions et réponses suggérées"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les suggestions d\'actions et de réponses"</string>
-    <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et répétées"</string>
+    <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et en attente"</string>
     <string name="notification_history" msgid="8663811361243456201">"Historique des notifications"</string>
     <string name="notification_history_toggle" msgid="9093762294928569030">"Utiliser l\'historique des notifications"</string>
     <string name="notification_history_off_title_extended" msgid="853807652537281601">"L\'historique des notifications est désactivé"</string>
@@ -3779,7 +3783,7 @@
     <string name="history_toggled_on_summary" msgid="9034278971358282728">"Les notifications récentes et répétées s\'afficheront ici"</string>
     <string name="notification_history_view_settings" msgid="5269317798670449002">"Afficher les paramètres de notification"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"Ouvrir la notification"</string>
-    <string name="snooze_options_title" msgid="2109795569568344617">"Autoriser la répétition des notifications"</string>
+    <string name="snooze_options_title" msgid="2109795569568344617">"Autoriser la mise en attente des notifications"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Masquer les icônes des notifications discrètes"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Les icônes des notifications discrètes ne s\'affichent pas dans la barre d\'état"</string>
     <string name="notification_badging_title" msgid="5469616894819568917">"Pastille de notification sur l\'icône de l\'application"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 9725d1a..b23c69b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -53,7 +53,7 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Ampliar"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3151963020165952847">"Usar Xirar automaticamente"</string>
-    <string name="smart_rotate_text_headline" msgid="436277795183609578">"A función Detección facial utiliza a cámara frontal para mellorar a precisión da opción Xirar automaticamente. As imaxes nunca se almacenan nin se envían a Google."</string>
+    <string name="smart_rotate_text_headline" msgid="436277795183609578">"A función Detección facial utiliza a cámara dianteira para mellorar a precisión da opción Xirar automaticamente. As imaxes nunca se almacenan nin se envían a Google."</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de mostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O marabilloso mago de Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Capítulo 11: A marabillosa Cidade Esmeralda de Oz"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"É posible que tamén teñas que escribir este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"É posible que tamén teñas que escribir esta clave de acceso no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para vincular con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asegúrate de que está mostrando esta clave de acceso:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirma que queres vincular o conxunto coordinado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vincular con este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para vincular con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe nel:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> e, a continuación, preme Retroceso ou Intro."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acceso aos teus contactos e ao historial de chamadas"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Non se puido conectar. Téntao de novo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Datos do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enderezo Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enderezo Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Queres esquecer o dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Quitar asociación"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Queres desconectar a aplicación?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configuración"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de audio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona o número máximo de dispositivos de audio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Rexistro de depuración da pilla de NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta o nivel de rexistro da pilla de NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emisión"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proxección"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activar visualización sen fíos"</string>
@@ -2668,7 +2672,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Aplicacións que máis batería consomen"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Consulta as aplicacións que máis batería consomen"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Carga limitada temporalmente"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para aforrar batería. Máis información."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para protexer a batería. Máis información."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Retomar carga"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Cando se dean determinadas condicións (por exemplo, temperaturas altas e períodos de carga longos), é posible que a carga se limite ao <xliff:g id="PERCENT">%1$s</xliff:g> para axudar á preservación da batería.\n\nCando esas condicións rematen, o teléfono volverá cargar con normalidade."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Cando se dean determinadas condicións (por exemplo, temperaturas altas e períodos de carga longos), é posible que a carga se limite ao <xliff:g id="PERCENT">%1$s</xliff:g> para axudar á preservación da batería.\n\nCando esas condicións rematen, a tableta volverá cargar con normalidade."</string>
@@ -4811,7 +4815,7 @@
     <string name="double_tap_power_for_camera_title" msgid="7982364144330923683">"Abrir cámara rapidamente"</string>
     <string name="double_tap_power_for_camera_summary" msgid="1100926048598415509">"Para abrir rapidamente a cámara, preme dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
     <string name="double_tap_power_for_camera_suggestion_title" msgid="4299496243418753571">"Abre a cámara rapidamente"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Xirar para cambiar á cámara frontal"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="472455236910935684">"Xirar para cambiar á cámara dianteira"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"Fai autofotos máis rápido"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"Navegación do sistema"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3cdfca7..75f105f 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"તમારે આ પિનને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"તમારે આ પાસકીને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"આની સાથે જોડી કરવા માટે:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ખાતરી કરો કે તે આ પાસકી દર્શાવી રહ્યું છે:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"સુસંગત સેટ સાથે જોડાણ બનાવવાનું કન્ફર્મ કરો"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"અહીંથી:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;આ ઉપકરણ સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"આની સાથે જોડી કરવા:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>તેના પર લખો:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, પછી Return અથવા Enter દબાવો."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"તમારા સંપર્કો અને કૉલ ઇતિહાસના ઍક્સેસની મંજૂરી આપો"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"કનેક્ટ ન કરી શક્યાં. ફરી પ્રયાસ કરો."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ડિવાઇસની વિગતો"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ડિવાઇસનું બ્લૂટૂથ ઍડ્રેસ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ડિવાઇસને ભૂલી જઈએ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"જોડાણ કાઢી નાખો"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ઍપને ડિસ્કનેક્ટ કરીએ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"સેટિંગ યાદ રાખો"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"મહત્તમ સંખ્યામાં કનેક્ટ થયેલા બ્લૂટૂથ ઑડિયો ડિવાઇસ પસંદ કરો"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC સ્ટૅકનો ડિબગ લૉગ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC સ્ટૅકનું લૉગ ઇન કરવાનું લેવલ વધારો"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"કાસ્ટ કરો"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"મીરર"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"વાયરલેસ ડિસ્પ્લે સક્ષમ કરો"</string>
@@ -2667,7 +2671,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"અમુક સુવિધાઓ મર્યાદિત હોઈ શકે છે"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"બૅટરીનો સૌથી વધુ વપરાશ"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"સૌથી વધુ વપરાતી હોય એવી ઍપ જુઓ"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ચાર્જિંગ હંગામીરૂપે પ્રતિબંધિત કરવામાં આવ્યું છે"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ચાર્જ કરવાનું થોડા સમય માટે મર્યાદિત કરવામાં આવ્યું છે"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"તમારી બૅટરીની જાળવણી માટે. વધુ જાણો."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"ચાર્જ કરવાનું ફરી શરૂ કરો"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"ઉચ્ચ તાપમાન અને ચાર્જિંગની લાંબી અવધિ જેવી અમુક ચોક્કસ પરિસ્થિતિઓમાં, ચાર્જિંગ <xliff:g id="PERCENT">%1$s</xliff:g> સુધી મર્યાદિત હોઈ શકે છે જેથી બૅટરીની ક્ષમતાને જાળવી રાખવામાં સહાય કરી શકાય.\n\n"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 3b3d8fb..e4e1ad5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -476,7 +476,7 @@
     <item msgid="5777152116210127847">"शीर्ष गतिविधि"</item>
     <item msgid="1834030155560727324">"महत्वपूर्ण (अग्रभाग)"</item>
     <item msgid="8494424742994426350">"महत्वपूर्ण (पृष्ठभूमि)"</item>
-    <item msgid="5099332663422156149">"बैकअप"</item>
+    <item msgid="5099332663422156149">"बैक अप"</item>
     <item msgid="7701089238529887617">"अत्यधिक"</item>
     <item msgid="3006466648960525485">"सेवा (चल रही है)"</item>
     <item msgid="2253476667031759713">"सेवा (फिर से प्रारंभ हो रही है)"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3e9058b..d1960d3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -54,9 +54,9 @@
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"बड़ा करें"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="3151963020165952847">"ऑटो-रोटेट की सुविधा का इस्तेमाल करें"</string>
     <string name="smart_rotate_text_headline" msgid="436277795183609578">"चेहरे की पहचान करने वाली तकनीक, स्क्रीन की अपने-आप दिशा बदलने (ऑटो-रोटेट) की सेटिंग को बेहतर बनाने के लिए, सामने वाले कैमरे का इस्तेमाल करती है. इमेज न तो सेव की जाती है और न ही Google को भेजी जाती है."</string>
-    <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमूना लेख"</string>
+    <string name="font_size_preview_text_headline" msgid="1173103737980511652">"सैंपल टेक्स्ट"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ओज़ का अद्भुत जादू"</string>
-    <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"अध्याय 11: पन्ने का अद्भुत शहर ओज़"</string>
+    <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"पाठ 11: ओज़ का पन्ने वाला अद्भुत शहर"</string>
     <string name="font_size_preview_text_body" msgid="3323732544011097199">"हरे रंग के चश्मे पहने हुए भी डॉरथी और उसके दोस्त इस अद्भुत शहर की चकाचौंध से चकित थे. हरे रंग के संगमरमर से बने खूबसूरत घर सड़कों के किनारे कतार में खड़े थे और उन पर चमचमाते पन्ने जड़े हुए थे. वे उसी हरे रंग के संगमरमर पर चलने लगे, जहां पास-पास रखे गए ब्लॉक आपस में जुड़ रहे थे; वे पन्ने की कतारें थीं और सूरज की चमक से चमचमा रही थीं. जहां खिड़कियों के शीशे हरे रंग के थे; यहां तक की शहर के ऊपर छाया आसमान भी हरा रंग लिए था, और सूरज की किरणें भी हरी थीं. \n\nवहां कई लोग थे, महिलाएं, पुरुष, और बच्चे. उन सभी ने हरे रंग के कपड़े पहने हुए थे और उनकी त्वचा भी हरे रंग की थी. उन्होंने डॉरथी और उसके अजीबो-गरीब दोस्तों की ओर अचरज भरी नज़रों से देखा. जब बच्चों ने शेर को देखा, तो वे सभी अपनी-अपनी मां के पीछे जाकर छिप गए, लेकिन किसी ने भी उनसे बात नहीं की. सड़क पर कई दुकानें थीं और डॉरथी ने देखा कि वहां सब कुछ हरा था. हरी कैंडी और हरे पॉपकॉर्न बिक रहे थे. साथ ही, हरे जूते, हरी टोपियां, और सभी तरह के हरे कपड़े भी. एक जगह पर, एक व्यक्ति हरे रंग वाला नींबू का शरबत बेच रहा था. डॉरथी ने देखा कि शरबत खरीदने के लिए बच्चे हरे रंग के सिक्के दिए. \n\nवहां कोई भी घोड़ा या किसी भी तरह का कोई जानवर नहीं था; लोग उनके सामने से हरे रंग की गाड़ियों में यहां-वहां सामान ले जा रहे थे. हर कोई खुश, संतुष्ट और समृद्ध नज़र आ रहा था."</string>
     <string name="font_size_save" msgid="206892409190870726">"ठीक है"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="6071836464978826249">"USB मेमोरी"</string>
@@ -805,7 +805,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> चालू ऐप्लिकेशन</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"भरोसेमंद एजेंट"</string>
-    <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"उपयोग करने के लिए, सबसे पहले स्क्रीन लॉक सेट करें"</string>
+    <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"इस्तेमाल करने के लिए, सबसे पहले स्क्रीन लॉक सेट करें"</string>
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"कोई नहीं"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> सक्रिय भरोसेमंद एजेंट</item>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"आपको अन्‍य डिवाइस पर भी यह पि‍न लिखने की आवश्‍यकता हो सकती है."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"आपको अन्‍य डिवाइस पर भी यह पासकी लिखनी होगी."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"इससे युग्मित करने के लिए:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;पक्का करें कि वह यह पासकी दिखा रहा है:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"कोऑर्डिनेटेड सेट से जोड़ने के लिए पुष्टि करें"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"इससे:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;इस डिवाइस से जोड़ें?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"इसके साथ युग्‍मित करने के लिए:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>इस पर लिखें:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, फिर Return या Enter दबाएं."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"अपने संपर्क और कॉल इतिहास देखने की मंज़ूरी दें"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"कनेक्ट नहीं हो सका. फिर से कोशिश करें."</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिवाइस की जानकारी"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिवाइस का ब्लूटूथ पता: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिवाइस के ब्लूटूथ का पता:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिवाइस को भूलना चाहते हैं?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"डिसकनेक्ट करें"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"क्या आप ऐप्लिकेशन को डिसकनेक्ट करना चाहते हैं?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिंग याद रखें"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"यह चुनें कि ब्लूटूथ के ज़रिए ज़्यादा से ज़्यादा कितने ऑडियो डिवाइस जुड़ सकते हैं"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"एनएफ़सी स्टैक डीबग लॉग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"एनएफ़सी स्टैक को लॉग करने का लेवल बढ़ाएं"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्ट करें"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रीन शेयर करें"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
@@ -976,7 +980,7 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"जब वाई-फ़ाई के ज़रिए इंटरनेट न उपलब्ध हो, तो मोबाइल डेटा इस्तेमाल करें. डेटा के लिए भुगतान करना पड़ सकता है."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"नेटवर्क जोड़ें"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"वाई-फ़ाई से जुड़ी पसंद"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"नेटवर्क मिलने पर वाई-फ़ाई अपने आप चालू हो जाता है"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"नेटवर्क मिलने पर वाई-फ़ाई अपने-आप चालू हो जाता है"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"नेटवर्क मिलने पर भी वाई-फ़ाई अपने-आप चालू नहीं होता"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"वाई-फ़ाई  नेटवर्क"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"ज़्यादा विकल्प"</string>
@@ -1314,7 +1318,7 @@
     <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"फ़ोन घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
     <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"फ़ोन घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
-    <string name="brightness" msgid="6216871641021779698">"स्क्रीन की रोशनी का स्तर"</string>
+    <string name="brightness" msgid="6216871641021779698">"स्क्रीन की रोशनी का लेवल"</string>
     <string name="brightness_title" msgid="5457874893085305155">"स्क्रीन की रोशनी"</string>
     <string name="brightness_summary" msgid="6309641759293018049">"स्‍क्रीन की रोशनी एडजस्ट करें"</string>
     <string name="auto_brightness_title" msgid="4239324728760986697">"आस-पास की रोशनी के हिसाब से स्क्रीन की चमक"</string>
@@ -1495,9 +1499,9 @@
     <string name="device_status" msgid="7988547478034984649">"स्थिति"</string>
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"बैटरी, नेटवर्क की स्‍थिति, और अन्‍य जानकारी"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"फ़ोन नंबर, सिग्‍नल, इत्‍यादि"</string>
-    <string name="storage_settings" msgid="7472188817781592677">"मेमोरी"</string>
-    <string name="storage_settings_for_app" msgid="229425418984637483">"मेमोरी और कैश"</string>
-    <string name="storage_usb_settings" msgid="7058142934214211583">"मेमोरी"</string>
+    <string name="storage_settings" msgid="7472188817781592677">"स्टोरेज"</string>
+    <string name="storage_settings_for_app" msgid="229425418984637483">"स्टोरेज और कैश"</string>
+    <string name="storage_usb_settings" msgid="7058142934214211583">"स्टोरेज"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"मेमोरी सेटिंग"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"USB मेमोरी अनमाउंट करें, उपलब्‍ध मेमोरी देखें"</string>
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SD कार्ड अनमाउंट करें, उपलब्‍ध मेमोरी देखें"</string>
@@ -1730,7 +1734,7 @@
     <string name="restore_default_apn" msgid="6596048535642130689">"डिफ़ॉल्‍ट APN सेटिंग पुनर्स्थापित हो रही हैं."</string>
     <string name="menu_restore" msgid="4310539620115151551">"डिफ़ॉल्ट पर रीसेट करें"</string>
     <string name="restore_default_apn_completed" msgid="5167505087078340256">"डिफ़ॉल्‍ट APN सेटिंग रीसेट करना पूरा हुआ."</string>
-    <string name="reset_dashboard_title" msgid="7423200250697886918">"रीसेट विकल्प"</string>
+    <string name="reset_dashboard_title" msgid="7423200250697886918">"डिवाइस को रीसेट करने के विकल्प"</string>
     <string name="reset_dashboard_summary" msgid="4390780188264852956">"नेटवर्क, ऐप्लिकेशन या डिवाइस रीसेट किए जा सकते हैं"</string>
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ऐप्लिकेशन रीसेट किए जा सकते हैं"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"वाई-फ़ाई, मोबाइल, और ब्लूटूथ रीसेट करें"</string>
@@ -2031,7 +2035,7 @@
     <string name="advanced_settings" msgid="2368905204839169094">"बेहतर सेटिंग"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"और सेटिंग विकल्‍प चालू करें"</string>
     <string name="application_info_label" msgid="1015706497694165866">"ऐप्लिकेशन की जानकारी"</string>
-    <string name="storage_label" msgid="2522307545547515733">"मेमोरी"</string>
+    <string name="storage_label" msgid="2522307545547515733">"स्टोरेज"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"डिफ़ॉल्ट रूप से खोलें"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"डिफ़ॉल्‍ट"</string>
     <string name="screen_compatibility_label" msgid="7549658546078613431">"स्क्रीन संगतता"</string>
@@ -2667,7 +2671,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"हो सकता है कि कुछ सुविधाओं का पूरा इस्तेमाल न किया जा सके"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"सबसे ज़्यादा बैटरी खर्च"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"सबसे ज़्यादा बैटरी खर्च करने वाले ऐप्लिकेशन देखें"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"चार्जिंग कुछ समय के लिए सीमित की गई"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"कुछ समय के लिए चार्जिंग रोक दी गई"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"बैटरी कम खर्च करने के लिए. ज़्यादा जानें."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"चार्जिंग फिर से शुरू करें"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"लंबे समय तक चार्ज करने और ज़्यादा गर्म होने जैसी कुछ स्थितियों में, बैटरी की परफ़ॉर्मेंस को बेहतर बनाए रखने के लिए, हो सकता है कि वह <xliff:g id="PERCENT">%1$s</xliff:g> तक ही चार्ज हो पाए.\n\nइन स्थितियों के बदल जाने पर, आपका फ़ोन अपने-आप सामान्य रूप से चार्ज होने लगेगा."</string>
@@ -2948,16 +2952,16 @@
     <string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> वीपीएन सुरक्षित नहीं हैं"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"अडैप्टिव कनेक्टिविटी का विकल्प चुनने पर, आपका इंटरनेट कनेक्शन अपने-आप मैनेज हो जाएगा. इससे बैटरी लाइफ़ बढ़ती है और डिवाइस की परफ़ॉर्मेंस बेहतर होती है"</string>
-    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"चालू करें"</string>
+    <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"चालू"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"बंद करें"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेंशियल स्टोरेज"</string>
-    <string name="credentials_install" msgid="3933218407598415827">"कोई प्रमाणपत्र इंस्टॉल करें"</string>
+    <string name="credentials_install" msgid="3933218407598415827">"कोई सर्टिफ़िकेट इंस्टॉल करें"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
-    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD कार्ड से प्रमाणपत्र इंस्‍टॉल करें"</string>
+    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"एसडी कार्ड से सर्टिफ़िकेट इंस्‍टॉल करें"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"क्रेडेंशियल हटाएं"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"सभी प्रमाणपत्र हटाएं"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"सभी सर्टिफ़िकेट हटाएं"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"भरोसेमंद क्रेडेंशियल"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"भरोसेमंद CA प्रमाणपत्र दिखाएं"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"भरोसेमंद CA सर्टिफ़िकेट दिखाएं"</string>
     <string name="user_credentials" msgid="4044405430790970775">"उपयोगकर्ता के क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"सेव किए गए क्रेडेंशियल देखें और उनमें बदलाव करें"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"बेहतर सेटिंग"</string>
@@ -2981,8 +2985,8 @@
     <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"अनुमति न दें"</string>
     <string name="request_manage_credentials_allow" msgid="4910940118408348245">"अनुमति दें"</string>
     <string name="request_manage_credentials_more" msgid="6101210283534101582">"ज़्यादा दिखाएं"</string>
-    <string name="certificate_management_app" msgid="8086699498358080826">"प्रमाणपत्र मैनेजमेंट ​ऐप"</string>
-    <string name="no_certificate_management_app" msgid="3025739370424406717">"प्रमाणपत्र मैनेज करने के लिए कोई ऐप्लिकेशन नहीं है"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"सर्टिफ़िकेट मैनेजमेंट ​ऐप"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"सर्टिफ़िकेट मैनेज करने के लिए कोई ऐप्लिकेशन नहीं है"</string>
     <string name="certificate_management_app_description" msgid="8507306554200869005">"जब आप यहां बताए गए ऐप्लिकेशन और यूआरएल का इस्तेमाल करेंगे, तो सर्टिफ़िकेट आपकी पुष्टि करेंगे"</string>
     <string name="uninstall_certs_credential_management_app" msgid="4945883254446077354">"सर्टिफ़िकेट अनइंस्टॉल करें"</string>
     <string name="remove_credential_management_app" msgid="6089291496976812786">"ऐप्लिकेशन हटाएं"</string>
@@ -3064,7 +3068,7 @@
     <string name="sync_enabled" msgid="5794103781356455043">"समन्वयन चालू है"</string>
     <string name="sync_disabled" msgid="1636223106968593391">"सिंक बंद है"</string>
     <string name="sync_error" msgid="846923369794727644">"समन्वयन गड़बड़ी"</string>
-    <string name="last_synced" msgid="1527008461298110443">"आखिरी बार सिंक <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> किया गया था"</string>
+    <string name="last_synced" msgid="1527008461298110443">"आखिरी बार <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> पर किया गया था"</string>
     <string name="sync_in_progress" msgid="6200093151211458977">"अभी सिंक हो रहा है…"</string>
     <string name="settings_backup" msgid="5357973563989458049">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="6803046376335724034">"मेरी सेटिंग का बैक अप लें"</string>
@@ -3379,7 +3383,7 @@
     <string name="restriction_menu_reset" msgid="92859464456364092">"प्रतिबंधों को निकालें"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"पिन बदलें"</string>
     <string name="help_label" msgid="2896538416436125883">"सहायता और फ़ीडबैक"</string>
-    <string name="support_summary" msgid="6137136608018134563">"सहायता लेख, स्मार्टफ़ोन, और चैट"</string>
+    <string name="support_summary" msgid="6137136608018134563">"सहायता लेख, फ़ोन और चैट"</string>
     <string name="user_account_title" msgid="6389636876210834864">"सामग्री के लिए खाता"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"फ़ोटो आईडी"</string>
     <string name="extreme_threats_title" msgid="1098958631519213856">"गंभीर धमकियां"</string>
@@ -4364,7 +4368,7 @@
     <string name="app_usage_preference" msgid="7062447555623339120">"ऐप उपयोग की प्राथमिकताएं"</string>
     <string name="time_spent_in_app_pref_title" msgid="25327097913383330">"डिवाइस के इस्तेमाल में बीता समय"</string>
     <string name="usage_access_description" msgid="8547716253713890707">"\'डेटा खर्च\' देखने की अनुमति से कोई ऐप्लिकेशन इस बात पर नज़र रख पाता है कि आप किन ऐप्लिकेशन को चला रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही, ऐप्लिकेशन आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग, और दूसरी जानकारी देख पाता है."</string>
-    <string name="memory_settings_title" msgid="6582588646363308430">"मेमोरी"</string>
+    <string name="memory_settings_title" msgid="6582588646363308430">"स्टोरेज"</string>
     <string name="memory_details_title" msgid="3048107441540417799">"मेमोरी का विवरण"</string>
     <string name="always_running" msgid="9012705720688200252">"हमेशा चलने वाला (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="7954947311082655448">"कभी-कभी चलने वाला (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -4745,8 +4749,8 @@
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"ओवरले लागू नहीं किया जा सका"</string>
     <string name="special_access" msgid="1767980727423395147">"ऐप्लिकेशन के लिए खास ऐक्सेस"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकता है</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकते हैं</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का इस्तेमाल कर सकता है</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का इस्तेमाल कर सकते हैं</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"और देखें"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"उपयोगकर्ता डेटा को मिटाना और फ़ाइल सुरक्षित करने के तरीके में बदलना चाहते हैं?"</string>
@@ -5021,7 +5025,7 @@
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"अपने-आप, भरना, अपने-आप भरने वाला, पासवर्ड"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;पक्का करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना,&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें तय करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का इस्तेमाल करता है."</string>
-    <string name="debug_autofill_category" msgid="5998163555428196185">"अपने-आप भरने की सुविधा (ऑटो फ़िल)"</string>
+    <string name="debug_autofill_category" msgid="5998163555428196185">"ऑटोमैटिक भरने की सुविधा"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"लॉग की गई जानकारी का लेवल"</string>
     <string name="autofill_max_partitions" msgid="7342195529574406366">"हर सत्र में ज़्यादा से ज़्यादा इतने अनुरोध शामिल कर सकते हैं"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"दिखने वाले डेटा सेट की ज़्यादा से ज़्यादा संख्या"</string>
@@ -5538,7 +5542,7 @@
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठीक है"</string>
     <string name="enable_2g_title" msgid="8184757884636162942">"2G के इस्तेमाल की मंज़ूरी दें"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"2G मोबाइल इंटरनेट कनेक्शन का इस्तेमाल करें. आपातकालीन कॉल करने के लिए, 2G सेवा हमेशा चालू रहती है."</string>
-    <string name="show_clip_access_notification" msgid="7782300987639778542">"क्लिपबोर्ड में स्टोर किए गए डेटा को दिखाएं"</string>
+    <string name="show_clip_access_notification" msgid="7782300987639778542">"क्लिपबोर्ड का डेटा ऐक्सेस किए जाने पर मैसेज दिखाएं"</string>
     <string name="show_clip_access_notification_summary" msgid="474090757777203207">"जब ऐप्लिकेशन, कॉपी किए गए टेक्स्ट, इमेज या अन्य कॉन्टेंट का इस्तेमाल करें, तो मैसेज दिखाएं"</string>
     <string name="all_apps" msgid="3054120149509114789">"सभी ऐप्लिकेशन"</string>
     <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"अनुमति न दें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e2d9c81..74bd4d6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -844,6 +844,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Možda biste također trebali unijeti ovaj PIN i na drugi uređaj."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Možda ćete ovaj pristupni kôd trebati unijeti i na drugi uređaj."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Za uparivanje s:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uvjerite se da prikazuje ovaj pristupni kôd:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrdite za uparivanje s koordiniranim skupom"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upariti se s ovim uređajem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Za uparivanje s uređajem:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>upišite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> na tom uređaju pa pritisnite tipke Return ili Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dopuštam pristup kontaktima i povijesti poziva"</string>
@@ -877,6 +878,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezivanje nije uspjelo. Pokušajte ponovo."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O uređaju"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth adresa uređaja: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth adresa uređaja:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zaboraviti uređaj?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ukloni povezivanje"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Prekinuti vezu s aplikacijom?"</string>
@@ -909,6 +911,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamti postavke"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalan broj povezanih Bluetooth audiouređaja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Odaberite maksimalan broj povezanih Bluetooth audiouređaja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Zapisnik o otklanjanju pogrešaka za NFC stog"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povećajte razinu zapisivanja za NFC stog"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emitiranje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcalo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogući bežični prikaz"</string>
@@ -2701,10 +2705,10 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Velika potrošnja baterije"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Pogledajte aplikacije s najvećom potrošnjom baterije"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Punjenje je privremeno ograničeno"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Da biste štedjeli bateriju. Saznajte više."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Radi očuvanja baterije. Saznajte više."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Nastavi s punjenjem"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"U određenim uvjetima, kao što su visoke temperature i duga razdoblja punjenja, punjenje se može ograničiti na <xliff:g id="PERCENT">%1$s</xliff:g> radi očuvanja dobrog stanja baterije.\n\nKad ti uvjeti završe, telefon će se automatski puniti na uobičajen način."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"U određenim uvjetima, kao što su visoke temperature i duga razdoblja punjenja, punjenje se može ograničiti na <xliff:g id="PERCENT">%1$s</xliff:g> radi očuvanja dobrog stanja baterije.\n\nKad ti uvjeti završe, tablet će se automatski puniti na uobičajen način."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"U određenim uvjetima kao što su visoke temperature i kada je uređaj priključen na punjenje duže vrijeme, punjenje se može ograničiti na <xliff:g id="PERCENT">%1$s</xliff:g> radi očuvanja baterije.\n\nKada se uvjeti promijene, telefon će se automatski puniti na uobičajen način."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"U određenim uvjetima kao što su visoke temperature i kada je uređaj priključen na punjenje duže vrijeme, punjenje se može ograničiti na <xliff:g id="PERCENT">%1$s</xliff:g> radi očuvanja baterije.\n\nKada se uvjeti promijene, tablet će se automatski puniti na uobičajen način."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Budući da ste upotrebljavali telefon više nego obično, baterija bi se mogla brže isprazniti.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Budući da ste upotrebljavali tablet više nego obično, baterija bi se mogla brže isprazniti.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Budući da ste upotrebljavali uređaj više nego obično, baterija bi se mogla brže isprazniti.\n\nAplikacije koje najviše troše bateriju:"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1e2afc2..f5f8ebb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Előfordulhat, hogy a PIN-kódot a másik készüléken is meg kell adnia."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Előfordulhat, hogy az azonosító kulcsot a másik eszközön is be kell írnia."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párosítás ezzel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Győződjön meg arról, hogy a következő azonosítókulcs látható rajta:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Erősítse meg a koordinált készlettel való párosításhoz"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Küldő:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párosítja a készüléket?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"A(z) <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> eszközzel való párosításhoz írja be rajta a következőt: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, majd nyomja meg a Return vagy az Enter billentyűt."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Hozzáférést biztosít névjegyeihez és híváslistájához"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"A csatlakozás sikertelen. Próbálja újra."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Eszközadatok"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Az eszköz Bluetooth-címe: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Az eszköz Bluetooth-címe:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Elfelejti az eszközt?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Társítás megszüntetése"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Leválasztja az alkalmazást?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Beállítások megjegyzése"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Csatlakoztatott Bluetooth-audioeszközök maximális száma"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Válassza ki a csatlakoztatott Bluetooth-audioeszközök maximális számát"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC-verem hibakeresési naplója"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC-verem naplózási szintjének emelése"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tartalomátküldés"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"tükrözés"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Vezeték nélküli kijelző engedélyezése"</string>
@@ -1822,7 +1826,7 @@
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"A hotspot és az internetmegosztás funkcióval más eszközöknek biztosíthat internet-hozzáférést saját Wi‑Fi- vagy mobiladat-kapcsolatán keresztül. Az alkalmazások szintén létrehozhatnak hotspotot, hogy tartalmat osszanak meg a közeli eszközökkel."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Súgó"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobilhálózat"</string>
-    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobil-előfizetés"</string>
+    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobilcsomag"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"SMS-küldő"</string>
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Módosítja az SMS-alkalmazást?"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"A(z) <xliff:g id="CURRENT_APP">%2$s</xliff:g> helyett a(z) <xliff:g id="NEW_APP">%1$s</xliff:g> kezelje az SMS-eket?"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 3310712..5acd8fa 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Հնարավոր է պետք լինի մուտքագրել այս PIN-ը մյուս սարքերի վրա ևս:"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Հնարավոր է պետք լինի մուտքագրել այս անցաբառը այլ սարքերում:"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-ի հետ զուգավորելու համար համոզվեք այն ցուցադրում է անցաբառը`:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Հաստատեք՝ համակարգված հավաքածուի հետ զուգակցվելու համար"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Ումից`&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Զուգավորվե՞լ այս սարքի հետ:"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-ի հետ զուգավորելու համար մուտքագրեք`<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, այնուհետև սեղմեք հետդարձ կամ հաստատում:"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Թույլատրել կոնտակտների ու զանգերի պատմության հասանելիությունը"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Չհաջողվեց կապակցվել: Փորձեք նորից:"</string>
     <string name="device_details_title" msgid="1155622417516195481">"Սարքի տվյալները"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Սարքի Bluetooth հասցեն՝ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Սարքի Bluetooth հասցեն՝\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Մոռանա՞լ սարքը"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Հեռացնել կապը"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Չեղարկե՞լ հավելվածի կապը"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Հիշել կարգավորումները"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Թույլատրելի առավելագույն թվով միացված Bluetooth աուդիո սարքեր"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Նշեք միացված Bluetooth աուդիո սարքերի թույլատրելի առավելագույն թիվը"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC սթեքի վրիպազերծման մատյան"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Բարձրացնել NFC սթեքի գրանցման մակարդակը"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Հեռարձակում"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"հայելապատճենում"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Միացնել անլար էկրանը"</string>
@@ -976,7 +980,7 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Օգտագործել բջջային թրաֆիկը, եթե չի հաջողվում միանալ համացանցին Wi-Fi-ի միջոցով։ Կարող են կիրառվել գանձումներ։"</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Ավելացնել ցանց"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wi‑Fi-ի կարգավորումներ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi-ը ավտոմատ կերպով միանում է"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi-ը նորից միանում է ավտոմատ կերպով"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi-ը ավտոմատ կերպով չի միանում"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"Wi‑Fi ցանցեր"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Ավելի շատ ընտրանքներ"</string>
@@ -1822,7 +1826,7 @@
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ ձեր Wi-Fi-ի կամ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետ կապ տրամադրելու համար։ Հավելվածները նույնպես կարող են թեժ կետ ստեղծել՝ մոտակա սարքերի հետ բովանդակությամբ կիսվելու համար։"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Օգնություն"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Բջջային ցանց"</string>
-    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Բջջային փաթեթ"</string>
+    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Սակագնային պլան"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"SMS-ների փոխանակման հավելված"</string>
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Փոխե՞լ SMS-ների փոխանակման հավելվածը"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Որպես SMS-ների փոխանակման հավելված <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
@@ -3489,7 +3493,7 @@
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Բջջային ինտերնետ, Wi‑Fi, թեժ կետ"</string>
     <string name="network_dashboard_summary_no_mobile" msgid="4022575916334910790">"Wi-Fi, թեժ կետ"</string>
     <string name="connected_devices_dashboard_title" msgid="19868275519754895">"Միացված սարքեր"</string>
-    <string name="connected_devices_dashboard_default_summary" msgid="7211769956193710397">"Bluetooth, զուգավորում"</string>
+    <string name="connected_devices_dashboard_default_summary" msgid="7211769956193710397">"Bluetooth, զուգակցում"</string>
     <string name="connected_devices_dashboard_summary" msgid="6927727617078296491">"Bluetooth, վարելու ռեժիմ, NFC"</string>
     <string name="connected_devices_dashboard_no_nfc_summary" msgid="8424794257586524040">"Bluetooth, վարելու ռեժիմ"</string>
     <string name="connected_devices_dashboard_no_driving_mode_summary" msgid="7155882619333726331">"Bluetooth, NFC"</string>
@@ -3911,7 +3915,7 @@
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Երբեք"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Սարքերի և հավելվածների ծանուցումներ"</string>
-    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Նշեք, թե որ հավելվածները կարող են դիտել ծանուցումները"</string>
+    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Ընտրել հավելվածներն ու սարքերը, որոնք կարող են կարդալ ծանուցումները"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Աշխատանքային պրոֆիլի ծանուցումների մուտքն արգելափակված է"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 95fd492..1011d48 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Anda mungkin juga perlu mengetikkan PIN ini ke perangkat lain."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Anda mungkin juga perlu mengetikkan sandi ini ke perangkat lain."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Untuk menyandingkan dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan bahwa perangkat tersebut menampilkan kode sandi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Konfirmasikan agar dapat tersambung dengan kumpulan perangkat terkoordinasi"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sandingkan dengan perangkat ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Untuk menyandingkan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Ketikkan:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Izinkan akses ke kontak dan histori panggilan Anda"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Tidak dapat terhubung. Coba lagi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detail perangkat"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Alamat Bluetooth perangkat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Alamat Bluetooth perangkat:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Lupakan perangkat?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hapus atribusi"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Putuskan Koneksi Aplikasi?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ingat setelan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Perangkat audio Bluetooth maksimum yang terhubung"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pilih jumlah maksimum perangkat audio Bluetooth yang terhubung"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log debug stack NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tingkatkan level logging stack NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktifkan layar nirkabel"</string>
@@ -2131,7 +2135,7 @@
     <string name="no_default_apps" msgid="8966319676910104570">"Tak ada Aplikasi default."</string>
     <string name="storageuse_settings_title" msgid="3125650750657988194">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="5001621552305431831">"Lihat penyimpanan yang digunakan apl"</string>
-    <string name="service_restarting" msgid="5104563288155809226">"Memulai kembali"</string>
+    <string name="service_restarting" msgid="5104563288155809226">"Memulai ulang"</string>
     <string name="cached" msgid="5379485147573438201">"Proses latar belakang dalam cache"</string>
     <string name="no_running_services" msgid="9079738069349859373">"Tidak ada yang berjalan."</string>
     <string name="service_started_by_app" msgid="6845028506417670179">"Dimulai oleh apl."</string>
@@ -2667,8 +2671,8 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Beberapa fitur mungkin dibatasi"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Penggunaan baterai tinggi"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Lihat aplikasi dengan penggunaan tertinggi"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengisian daya dibatasi untuk sementara"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Untuk menghemat daya baterai. Pelajari lebih lanjut."</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengisian daya dibatasi sementara"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Untuk menjaga baterai. Pelajari lebih lanjut."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Lanjutkan pengisian daya"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dalam kondisi tertentu, seperti suhu yang tinggi dan periode pengisian daya yang lama, pengisian daya dapat dibatasi hingga <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu menjaga kesehatan baterai.\n\nSaat kondisi tersebut berakhir, ponsel akan otomatis mengisi daya secara normal."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dalam kondisi tertentu, seperti suhu yang tinggi dan periode pengisian daya yang lama, pengisian daya dapat dibatasi hingga <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu menjaga kesehatan baterai.\n\nSaat kondisi tersebut berakhir, tablet akan otomatis mengisi daya secara normal."</string>
@@ -3102,7 +3106,7 @@
     <string name="misc_files_selected_count" msgid="5597802791672749532">"Terpilih <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="7622766714974500289">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="7898929601615536401">"Pilih semua"</string>
-    <string name="data_usage_summary_title" msgid="394067070764360142">"Penggunaan kuota"</string>
+    <string name="data_usage_summary_title" msgid="394067070764360142">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="4933742247928064178">"Data seluler &amp; Wi‑Fi"</string>
     <string name="data_usage_accounting" msgid="6832015632699116754">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="data_usage_app" msgid="6367974637783240699">"Penggunaan aplikasi"</string>
@@ -4460,7 +4464,7 @@
     <string name="no_memory_use_summary" msgid="6708111974923274436">"Tidak ada memori yang digunakan dalam 3 jam terakhir"</string>
     <string name="sort_avg_use" msgid="4416841047669186903">"Urutkan menurut rata-rata penggunaan"</string>
     <string name="sort_max_use" msgid="3370552820889448484">"Urutkan menurut penggunaan maksimum"</string>
-    <string name="memory_performance" msgid="5448274293336927570">"Kinerja"</string>
+    <string name="memory_performance" msgid="5448274293336927570">"Performa"</string>
     <string name="total_memory" msgid="5244174393008910567">"Total memori"</string>
     <string name="average_used" msgid="690235917394070169">"Rata-rata digunakan (%)"</string>
     <string name="free_memory" msgid="439783742246854785">"Bebas"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index cfd733b..42152f3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -392,7 +392,7 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Notaðu andlitið til að taka símann úr lás eða til að auðkenna þig í forritum, t.d. þegar þú skráir þig inn eða samþykkir kaup.\n\nHafðu í huga:\nÞú getur aðeins verið með eitt andlit uppsett í einu. Eyddu núverandi andliti til að bæta nýju andliti við.\n\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann þinn með því að halda honum upp að andlitinu á þér.\n\nManneskja sem er mjög lík þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Notaðu andlitið til að taka símann úr lás eða til að auðkenna þig í forritum, t.d. þegar þú skráir þig inn eða samþykkir kaup.\n\nHafðu í huga:\nÞú getur aðeins verið með eitt andlit uppsett í einu. Eyddu núverandi andliti til að bæta nýju andliti við.\n\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann þinn með því að halda honum upp að andlitinu á þér, jafnvel þótt þú sért með lokuð augun.\n\nManneskja sem er mjög lík þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Eyða andlitslíkani?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Andlitslíkaninu þínu verður eytt endanlega á öruggan hátt. Þegar búið er að eyða því þarftu að nota fingrafar, PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás eða til að auðkenna þig í forritum."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Andlitslíkaninu þínu verður eytt endanlega á öruggan hátt. Þegar búið er að eyða því þarftu PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás eða til að auðkenna þig í forritum."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"Eyða andlitslíkani?"</string>
     <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"Andlitslíkaninu þínu verður eytt endanlega á öruggan hátt.\n\nÞegar búið er að eyða því þarftu að nota fingrafar, PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás eða til að auðkenna þig í forritum."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Notaðu andlitskenni til að taka símann úr lás"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Þú gætir einnig þurft að slá þetta PIN-númer inn í hinu tækinu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Þú gætir einnig þurft að slá þennan aðgangslykil inn á hinu tækinu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Til að para við:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gakktu úr skugga um að þessi aðgangslykill birtist:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Staðfestu pörun við samstillta settið"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Frá:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Para við þetta tæki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Til að para við:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Sláðu inn:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> og ýttu síðan á vendihnappinn eða Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Veita aðgang að tengiliðum þínum og símtalaferli"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ekki tókst að tengjast. Reyndu aftur."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Upplýsingar um tæki"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-vistfang tækis: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-vistfang tækis:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Gleyma tæki?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjarlægja tengingu"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Aftengja forrit?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Muna stillingar"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Hámarksfjöldi tengdra Bluetooth-hljómtækja"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Velja hámarksfjölda tengdra Bluetooth-hljómtækja"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Villuleitarannáll NFC-stafla"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Auka skráningarstig NFC-stafla"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Útsending"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegla"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Leyfa þráðlausan skjá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fc132ed..429abcb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -24,8 +24,8 @@
     <string name="confirmation_turn_on" msgid="2979094011928347665">"Attiva"</string>
     <string name="device_info_default" msgid="1406619232867343310">"Sconosciuto"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
+      <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
-      <item quantity="one">Ora ti manca <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passaggio per diventare uno sviluppatore.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già uno sviluppatore."</string>
@@ -156,7 +156,7 @@
     <string name="connected_device_previously_connected_title" msgid="605808252622814415">"Dispositivi connessi in precedenza"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Connessi in precedenza"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth attivato"</string>
-    <string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra tutte"</string>
+    <string name="previous_connected_see_all" msgid="7759413145713251328">"Mostra tutti"</string>
     <string name="date_and_time" msgid="1788358029823431692">"Data e ora"</string>
     <string name="choose_timezone" msgid="1450780665958642147">"Scegli il fuso orario"</string>
     <!-- no translation found for intent_sender_data_label (1733806423295725392) -->
@@ -209,8 +209,8 @@
     <string name="locale_remove_menu" msgid="3521546263421387474">"Rimuovi"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Aggiungi una lingua"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
+      <item quantity="one">Remove selected languages?</item>
       <item quantity="other">Rimuovere le lingue selezionate?</item>
-      <item quantity="one">Rimuovere la lingua selezionata?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Il testo verrà mostrato in un\'altra lingua."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Impossibile rimuovere tutte le lingue"</string>
@@ -299,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usa posizione"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
+      <item quantity="one">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app ha accesso alla posizione</item>
       <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app hanno accesso alla posizione</item>
-      <item quantity="one">ON - <xliff:g id="COUNT_0">%1$d</xliff:g> app ha accesso alla posizione</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Caricamento…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Le app con l\'autorizzazione Dispositivi nelle vicinanze possono stabilire la posizione relativa dei dispositivi connessi."</string>
@@ -403,8 +403,8 @@
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Aggiungi impronta"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"blocco schermo"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="6897454766137108776">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> impronta aggiunta</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> impronte aggiunte</item>
-      <item quantity="one">Impronta aggiunta</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Imposta la tua impronta"</string>
@@ -740,21 +740,21 @@
     <string name="lock_failed_attempts_now_wiping_profile" msgid="3171880997211568208">"Troppi tentativi errati. Questo profilo di lavoro e i relativi dati verranno eliminati."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Chiudi"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
+      <item quantity="one">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT_1">%d</xliff:g> caratteri</item>
-      <item quantity="one">Deve contenere almeno <xliff:g id="COUNT_0">%d</xliff:g> carattere</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
+      <item quantity="one">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Il PIN deve contenere almeno <xliff:g id="COUNT_1">%d</xliff:g> cifre</item>
-      <item quantity="one">Il PIN deve contenere almeno <xliff:g id="COUNT_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continua"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
+      <item quantity="one">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Deve contenere meno di <xliff:g id="NUMBER_1">%d</xliff:g> caratteri</item>
-      <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> carattere</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
+      <item quantity="one">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Deve contenere meno di <xliff:g id="NUMBER_1">%d</xliff:g> cifre</item>
-      <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non può contenere un carattere non valido"</string>
@@ -762,32 +762,32 @@
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve contenere almeno una cifra"</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Deve contenere almeno un simbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere</item>
-      <item quantity="one">Deve contenere almeno 1 lettera</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere minuscole</item>
-      <item quantity="one">Deve contenere almeno 1 lettera minuscola</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> lettere maiuscole</item>
-      <item quantity="one">Deve contenere almeno 1 lettera maiuscola</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> numeri</item>
-      <item quantity="one">Deve contenere almeno 1 numero</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> simboli speciali</item>
-      <item quantity="one">Deve contenere almeno 1 simbolo speciale</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non costituiti da una lettera</item>
-      <item quantity="one">Deve contenere almeno 1 carattere non costituito da una lettera</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
+      <item quantity="one">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non numerici</item>
       <item quantity="other">Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri non numerici</item>
-      <item quantity="one">Deve contenere almeno 1 carattere non numerico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
@@ -801,15 +801,15 @@
     <string name="manage_device_admin" msgid="1044620606203916275">"App di amministrazione del dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Nessuna app attiva"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app attive</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app attiva</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agenti di attendibilità"</string>
     <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"Per usare questa opzione, imposta prima un blocco schermo"</string>
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Nessuno"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agenti di attendibilità attivi</item>
-      <item quantity="one">1 agente di attendibilità attivo</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"Attiva Bluetooth"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Potrebbe inoltre essere necessario digitare questo PIN sull\'altro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Potrebbe inoltre essere necessario digitare questa passkey sull\'altro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Per l\'accoppiamento con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Assicurati che sia visualizzata questa passkey:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Conferma per eseguire l\'accoppiamento con il set coordinato"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Accoppiare con questo dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Per eseguire l\'accoppiamento con <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, digita sul dispositivo <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, quindi premi A capo o Invio."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Consenti l\'accesso ai tuoi contatti e alla cronologia chiamate"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Connessione non riuscita. Riprova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Dettagli dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Indirizzo Bluetooth del dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Indirizzo Bluetooth del dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Eliminare il dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Rimuovi associazione"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vuoi scollegare l\'app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ricorda impostazioni"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numero max dispositivi audio Bluetooth connessi"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Seleziona il numero massimo di dispositivi audio Bluetooth connessi"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log di debug stack NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumenta livello di logging stack NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Trasmissione"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroring"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Attiva display wireless"</string>
@@ -1121,16 +1125,16 @@
     <string name="wifi_forget_dialog_title" msgid="4363829200968563164">"Vuoi eliminare la rete?"</string>
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tutte le password relative a questa rete verranno eliminate"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
+      <item quantity="one">%d networks</item>
       <item quantity="other">%d reti</item>
-      <item quantity="one">1 rete</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
+      <item quantity="one">%d iscrizione</item>
       <item quantity="other">%d iscrizioni</item>
-      <item quantity="one">1 iscrizione</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
+      <item quantity="one">%d rete e iscrizione</item>
       <item quantity="other">%d reti e iscrizioni</item>
-      <item quantity="one">1 rete e iscrizione</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Wi‑Fi avanzate"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
@@ -1266,7 +1270,7 @@
     <string name="dtmf_tone_enable_title" msgid="2241337296249130217">"Toni tastierino"</string>
     <string name="sound_effects_enable_title" msgid="328569690466233866">"Suoni alla pressione"</string>
     <string name="lock_sounds_enable_title" msgid="804365014499259673">"Suono di blocco schermo"</string>
-    <string name="audio_record_proc_title" msgid="486071779724181619">"Eliminazione rumori"</string>
+    <string name="audio_record_proc_title" msgid="486071779724181619">"Cancellazione del rumore"</string>
     <string name="volume_media_description" msgid="2736061076584067204">"Musica, video, giochi e altri contenuti multimediali"</string>
     <string name="volume_ring_description" msgid="5423168446359881864">"Suoneria e notifiche"</string>
     <string name="volume_notification_description" msgid="3241009629930030492">"Notifiche"</string>
@@ -1435,7 +1439,7 @@
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostra sempre ora e informazioni"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maggiore utilizzo della batteria"</string>
     <string name="force_bold_text" msgid="4620929631102086716">"Testo in grassetto"</string>
-    <string name="title_font_size" msgid="570613010306330622">"Dimensione carattere"</string>
+    <string name="title_font_size" msgid="570613010306330622">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category" msgid="4280307997492851625">"Blocco della scheda SIM"</string>
@@ -1473,8 +1477,8 @@
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> è l\'unica SIM del tuo dispositivo. Vuoi utilizzarla per dati mobili, chiamate e SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Codice PIN della SIM errato. Devi contattare l\'operatore per sbloccare il dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
+      <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_1">%d</xliff:g> tentativi a disposizione.</item>
-      <item quantity="one">Codice PIN della SIM errato. Hai ancora <xliff:g id="NUMBER_0">%d</xliff:g> tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Codice PIN della SIM errato. Hai ancora un tentativo a disposizione, dopodiché dovrai contattare l\'operatore per sbloccare il dispositivo."</string>
     <string name="pin_failed" msgid="3726505565797352255">"Operazione con PIN della SIM non riuscita."</string>
@@ -1844,8 +1848,8 @@
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizzazioni per la posizione"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La geolocalizzazione non è attiva"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
+      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> hanno accesso alla posizione</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> hanno accesso alla posizione</item>
-      <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ha accesso alla posizione</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Accesso recente"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Mostra tutto"</string>
@@ -2020,8 +2024,8 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Consenti tutte le fonti di app"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"App aperte di recente"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
+      <item quantity="one">Mostra tutte le app (%1$d)</item>
       <item quantity="other">Mostra tutte le app (%1$d)</item>
-      <item quantity="one">Mostra tutte le app</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contatta il tuo amministratore IT"</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"Può aiutarti a reimpostare il PIN, la sequenza o la password"</string>
@@ -2040,8 +2044,8 @@
     <string name="clear_cache_btn_text" msgid="8597272828928143723">"Svuota cache"</string>
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
+      <item quantity="one">%d items</item>
       <item quantity="other">%d elementi</item>
-      <item quantity="one">1 elemento</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Cancella accesso"</string>
     <string name="controls_label" msgid="8671492254263626383">"Controlli"</string>
@@ -2269,7 +2273,7 @@
     <string name="usage_time_label" msgid="9105343335151559883">"Tempo di utilizzo"</string>
     <string name="accessibility_settings" msgid="4713215774904704682">"Accessibilità"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Impostazioni di accessibilità"</string>
-    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Display, interazione, audio"</string>
+    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Visualizzazione, interazione, audio"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Impostazioni visive"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambia dimensioni carattere"</string>
@@ -2431,8 +2435,8 @@
     <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Per accoppiare i tuoi apparecchi acustici, cerca e tocca il dispositivo nella prossima schermata. Assicurati che gli apparecchi acustici siano in modalità di accoppiamento."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"Dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> attivo"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
+      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> apparecchi acustici salvati</item>
-      <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> apparecchio acustico salvato</item>
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Regolazione dell\'audio"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Scorciatoia attivata"</string>
@@ -2462,20 +2466,20 @@
     <string name="reduce_bright_colors_intensity_end_label" msgid="1422600205484299860">"Più luminosità"</string>
     <string name="reduce_bright_colors_persist_preference_title" msgid="4368829654993343354">"Mantieni l\'opzione attiva dopo il riavvio del dispositivo"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
+      <item quantity="one">Breve (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Breve (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
-      <item quantity="one">Breve (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
+      <item quantity="one">Medio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Medio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
-      <item quantity="one">Medio (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
+      <item quantity="one">Lungo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
       <item quantity="other">Lungo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondi)</item>
-      <item quantity="one">Lungo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
+      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondi</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondi</item>
-      <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> secondo</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Squillo: <xliff:g id="SUMMARY_RING">%1$s</xliff:g> - Notifiche: <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g> - Tocco: <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="7776105450117095736">"Impostazione di suoneria e notifiche: off"</string>
@@ -2565,12 +2569,12 @@
     <string name="print_settings" msgid="8519810615863882491">"Stampa"</string>
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Off"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizi di stampa attivi</item>
-      <item quantity="one">1 servizio di stampa attivo</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> processi di stampa</item>
-      <item quantity="one">1 processo di stampa</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Servizi di stampa"</string>
     <string name="print_no_services_installed" msgid="7554057966540602692">"Nessun servizio installato"</string>
@@ -2677,24 +2681,24 @@
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Poiché hai utilizzato il dispositivo più del solito, la batteria potrebbe esaurirsi prima del previsto.\n\nApp che consumano maggiormente la batteria:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Include attività in background a consumo elevato"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
+      <item quantity="one">Restrict %1$d apps</item>
       <item quantity="other">Limita %1$d app</item>
-      <item quantity="one">Limita %1$d app</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
+      <item quantity="one">%2$d apps recently restricted</item>
       <item quantity="other">%2$d app con limitazione recente</item>
-      <item quantity="one">%1$s app con limitazione recente</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
+      <item quantity="one">%2$d apps have high background battery usage</item>
       <item quantity="other">Le app %2$d consumano molta batteria in background</item>
-      <item quantity="one">L\'app %1$s consuma molta batteria in background</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
+      <item quantity="one">These apps can\'t run in the background</item>
       <item quantity="other">Queste app non possono essere eseguite in background</item>
-      <item quantity="one">Questa app non può essere eseguita in background</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
+      <item quantity="one">Restrict %1$d apps?</item>
       <item quantity="other">Limitare %1$d app?</item>
-      <item quantity="one">Limitare l\'app?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Per consumare meno batteria, impedisci all\'app <xliff:g id="APP">%1$s</xliff:g> di usare batteria in background. L\'app potrebbe non funzionare correttamente e potresti ricevere le notifiche in ritardo."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Per consumare meno batteria, impedisci a queste app di utilizzare la batteria in background. Le app con limitazioni potrebbero non funzionare correttamente e potresti ricevere le relative notifiche in ritardo.\n\nApp:"</string>
@@ -2713,8 +2717,8 @@
     <string name="smart_battery_footer" msgid="8407121907452993645">"Quando Battery Manager rileva che le app stanno scaricando la batteria, puoi applicare limitazioni a queste app. Le app con limitazioni potrebbero non funzionare correttamente e potresti ricevere le notifiche in ritardo."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"App con limitazioni"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
+      <item quantity="one">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitazione del consumo della batteria per %1$d app</item>
-      <item quantity="one">Limitazione del consumo della batteria per %1$d app</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Limitazioni applicate <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="restricted_app_detail_footer" msgid="3495725286882138803">"Queste app non sono autorizzate a usare la batteria in background. Potrebbero non funzionare come previsto e potresti ricevere le notifiche in ritardo."</string>
@@ -2723,8 +2727,8 @@
     <string name="battery_manager_summary" msgid="255708681438809287">"Rilevamento del momento in cui le app scaricano la batteria attivo"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Off"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
+      <item quantity="one">%1$d apps restricted</item>
       <item quantity="other">%1$d app con restrizioni</item>
-      <item quantity="one">%1$d app con restrizioni</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="400958471814422770">"Problema durante la lettura dell\'indicatore di livello della batteria."</string>
@@ -2989,8 +2993,8 @@
     <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Rimuovere questa app?"</string>
     <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Questa app non gestirà i certificati, ma rimarrà sul dispositivo. Eventuali certificati installati dall\'app verranno disinstallati."</string>
     <plurals name="number_of_urls" formatted="false" msgid="403979258551655023">
+      <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> URL</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URL</item>
-      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
     </plurals>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Segnale chiamata di emergenza"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Imposta il comportamento in caso di chiamata di emergenza"</string>
@@ -3032,13 +3036,13 @@
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"Altre opzioni sono state disattivate dall\'amministratore."</string>
     <string name="admin_more_details" msgid="4928985331640193758">"Scopri di più"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"Log Notifiche"</string>
-    <string name="notification_history_title" msgid="8821060912502593309">"Cronologia notifiche"</string>
+    <string name="notification_history_title" msgid="8821060912502593309">"Cronologia delle notifiche"</string>
     <string name="notification_history_today" msgid="5828496957208237230">"Ultime 24 ore"</string>
     <string name="notification_history_snooze" msgid="3980568893290512257">"Posticipate"</string>
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Ignorate di recente"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
+      <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notifiche</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifiche</item>
-      <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notifica</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Suoneria e vibrazione chiamata"</string>
     <string name="wifi_setup_detail" msgid="2012898800571616422">"Dettagli rete"</string>
@@ -3288,21 +3292,21 @@
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"La rete potrebbe essere monitorata"</string>
     <string name="done_button" msgid="6269449526248267">"Fine"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
+      <item quantity="one">Trust or remove certificates</item>
       <item quantity="other">Considera attendibili i certificati o rimuovili</item>
-      <item quantity="one">Considera attendibile il certificato o rimuovilo</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha installato autorità di certificazione sul tuo dispositivo, da cui è possibile monitorare l\'attività di rete del dispositivo, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sui certificati.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha installato un\'autorità di certificazione sul tuo dispositivo, da cui è possibile monitorare l\'attività di rete del dispositivo, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sul certificato.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ha installato autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sui certificati.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni sul certificato.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Una terza parte può monitorare la tua attività di rete, inclusi siti web protetti, email e applicazioni.\n\nQuesto è reso possibile da credenziali attendibili installate sul tuo dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
+      <item quantity="one">Check certificates</item>
       <item quantity="other">Controlla i certificati</item>
-      <item quantity="one">Controlla il certificato</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Utenti multipli"</string>
     <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Condividi il tuo dispositivo aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sul dispositivo per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
@@ -3482,8 +3486,8 @@
     <string name="sim_selection_channel_title" msgid="3193666315607572484">"Selezione della SIM"</string>
     <string name="dashboard_title" msgid="5660733037244683387">"Impostazioni"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
+      <item quantity="one">Show %d hidden items</item>
       <item quantity="other">Mostra %d elementi nascosti</item>
-      <item quantity="one">Mostra %d elemento nascosto</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Rete e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Dati mobili, Wi‑Fi, hotspot"</string>
@@ -3639,7 +3643,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Attiva suoni"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sottotitoli in tempo reale"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sottotitoli automatici"</string>
-    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 pianificazione impostata}other{# pianificazioni impostate}}"</string>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 pianificazione impostata}one{# pianificazione impostata}other{# pianificazioni impostate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non disturbare"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ricevi soltanto le notifiche di app e persone importanti"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitare le interruzioni"</string>
@@ -3710,9 +3714,9 @@
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Chiedi ogni volta"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fino alla disattivazione"</string>
-    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}other{# ore}}"</string>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minuti}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 pianificazione può attivarsi automaticamente}other{Off/# pianificazioni possono attivarsi automaticamente}}"</string>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}one{# ore}other{# ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuti}other{# minuti}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 pianificazione può attivarsi automaticamente}one{Off/# pianificazione può attivarsi automaticamente}other{Off/# pianificazioni possono attivarsi automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Possono interrompere la modalità Non disturbare"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
@@ -3859,8 +3863,8 @@
     <string name="manage_conversations" msgid="4440289604887824337">"Gestisci le conversazioni"</string>
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Nessuna conversazione prioritaria"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversazioni prioritarie</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversazioni prioritarie</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> conversazione prioritaria</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversazioni prioritarie"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Appaiono in cima alla sezione delle conversazioni sotto forma di bolle mobili"</string>
@@ -3902,12 +3906,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Tutte le notifiche di <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifiche adattative"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
+      <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche al giorno</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche al giorno</item>
-      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifica al giorno</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
+      <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche alla settimana</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifiche alla settimana</item>
-      <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifica alla settimana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Mai"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Notifiche app e dispositivi"</string>
@@ -3915,8 +3919,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Le app non possono leggere le notifiche"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
+      <item quantity="one">%d apps can read notifications</item>
       <item quantity="other">Le app %d possono leggere le notifiche</item>
-      <item quantity="one">L\'app %d può leggere le notifiche</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Notifiche avanzate"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Ricevi suggerimenti di azioni, risposte e altro"</string>
@@ -3977,8 +3981,8 @@
     <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Questa app può utilizzare le autorizzazioni della tua app personale <xliff:g id="NAME">%1$s</xliff:g>, come l\'accesso alla posizione, allo spazio di archiviazione o ai contatti."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Nessuna app collegata"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> app collegate</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app collegate</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app collegata</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Per collegare queste app, installa l\'app <xliff:g id="NAME">%1$s</xliff:g> nel tuo profilo di lavoro"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Per collegare queste app, installa l\'app <xliff:g id="NAME">%1$s</xliff:g> nel tuo profilo personale"</string>
@@ -3993,20 +3997,20 @@
     <string name="notification_channels" msgid="1502969522886493799">"Categorie"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Altro"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"L\'app non ha pubblicato alcuna notifica"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"Altre impostazioni nell\'app"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Cronologia delle notifiche, bolle e inviate di recente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Attive per tutte le app"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
+      <item quantity="one">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Disattivate per <xliff:g id="COUNT_1">%d</xliff:g> app</item>
-      <item quantity="one">Disattivate per <xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie eliminate</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminata</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"On"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"Non attive"</string>
@@ -4078,7 +4082,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tutte le conversazioni"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversazioni prioritarie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nessuna"</string>
-    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}other{# conversazioni}}"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}one{# conversazioni}other{# conversazioni}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Chi può interrompere"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chiamate"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chiamate"</string>
@@ -4087,7 +4091,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assicurarti che le chiamate consentite possano essere sentite, controlla che la suoneria del telefono sia attiva"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Per la pianificazione \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatti speciali"</string>
-    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e # altro contatto}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nessun nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messaggi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messaggi"</string>
@@ -4097,7 +4101,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Per la pianificazione \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" i messaggi in arrivo sono bloccati. Puoi modificare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puoi ricevere tutti i messaggi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puoi ricevere tutte le chiamate"</string>
-    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}other{# contatti}}"</string>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}one{# contatti}other{# contatti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatti speciali"</string>
@@ -4135,13 +4139,13 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Le persone selezionate possono comunque contattarti, anche se non consenti l\'interruzione da parte delle app"</string>
-    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}one{{app_1}, {app_2} e # altra app possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifiche che possono interrompere"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Consenti tutte le notifiche"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}one{{sound_category_1}, {sound_category_2} e # altro suono possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niente può interrompere"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nessuno può interrompere"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Alcune persone possono interrompere"</string>
@@ -4166,12 +4170,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del giorno successivo"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Cambia su Solo sveglie sempre"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> minuti (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
-      <item quantity="one">Cambia su Solo sveglie per un minuto (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Cambia su Solo sveglie per <xliff:g id="DURATION">%1$d</xliff:g> ore (fino alle <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
-      <item quantity="one">Cambia su Solo sveglie per un\'ora (fino alle <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambia su Solo sveglie fino alle <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Cambia su Interrompi sempre"</string>
@@ -4245,24 +4249,24 @@
     <string name="app_launch_add_link" msgid="8622558044530305811">"Aggiungi link"</string>
     <string name="app_launch_footer" msgid="4521865035105622557">"Un\'app può verificare i link da aprire automaticamente nell\'app."</string>
     <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link verificato</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link verificati</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link verificato</item>
     </plurals>
     <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
-      <item quantity="other">Questi link sono stati verificati e vengono aperti automaticamente in questa app.</item>
       <item quantity="one">Questo link è stato verificato e viene aperto automaticamente in questa app.</item>
+      <item quantity="other">Questi link sono stati verificati e vengono aperti automaticamente in questa app.</item>
     </plurals>
     <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
     <string name="app_launch_verified_links_info_description" msgid="7514750232467132117">"Mostra l\'elenco di link verificati"</string>
     <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Controllo di altri link supportati in corso…"</string>
     <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annulla"</string>
     <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link supportato</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link supportati</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link supportato</item>
     </plurals>
     <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Aggiungi"</string>
     <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Si apre nell\'app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
-    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> in uso nella <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilizzati nella <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"memoria interna"</string>
     <string name="storage_type_external" msgid="125078274000280821">"memoria esterna"</string>
     <string name="data_summary_format" msgid="8802057788950096650">"<xliff:g id="SIZE">%1$s</xliff:g> utilizzati dal giorno <xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -4282,20 +4286,20 @@
     <string name="notification_summary_level" msgid="4074326972839105652">"Livello %d"</string>
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie disattivate</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria disattivata</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni concesse</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione concessa</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorizzazioni su <xliff:g id="COUNT_3">%d</xliff:g> concesse</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione su <xliff:g id="COUNT_1">%d</xliff:g> concessa</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizzazioni aggiuntive</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorizzazione aggiuntiva</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Nessuna autorizzazione concessa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Nessuna autorizzazione richiesta"</string>
@@ -4304,8 +4308,8 @@
     <string name="permissions_usage_summary" msgid="6784310472062516454">"Mostra quali app hanno usato le autorizzazioni di recente"</string>
     <string name="unused_apps" msgid="4566272194756830656">"App inutilizzate"</string>
     <plurals name="unused_apps_summary" formatted="false" msgid="3827583582750975783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> app inutilizzata</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app inutilizzate</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app inutilizzata</item>
     </plurals>
     <string name="unused_apps_switch" msgid="419282628373205038">"Rimuovi autorizzazioni e libera spazio"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Tutte le app"</string>
@@ -4331,15 +4335,15 @@
     <string name="domain_urls_summary_some" msgid="1197692164421314523">"Apri <xliff:g id="DOMAIN">%s</xliff:g> e altri URL"</string>
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Nessuna app che apre i link supportati"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app che aprono i link supportati</item>
-      <item quantity="one">Un\'app che apre i link supportati</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Consenti all\'app di aprire i link supportati"</string>
     <string name="app_link_open_ask" msgid="2422450109908936371">"Chiedi ogni volta"</string>
     <string name="app_link_open_never" msgid="5299808605386052350">"Non consentire all\'app di aprire i link"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
+      <item quantity="one">L\'app richiede di gestire <xliff:g id="COUNT_1">%d</xliff:g> link</item>
       <item quantity="other">L\'app richiede di gestire <xliff:g id="COUNT_1">%d</xliff:g> link</item>
-      <item quantity="one">L\'app richiede di gestire <xliff:g id="COUNT_0">%d</xliff:g> link</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'app richiede di gestire i seguenti link:"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"Predefinite"</string>
@@ -4380,12 +4384,12 @@
     <string name="show_all_apps" msgid="4490719452453223082">"Mostra utilizzo completo del dispositivo"</string>
     <string name="hide_extra_apps" msgid="7313907836289865123">"Mostra utilizzo delle app"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> app si comportano in modo anomalo</item>
-      <item quantity="one">L\'app <xliff:g id="APP">%1$s</xliff:g> si comporta in modo anomalo</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
+      <item quantity="one">Apps draining battery</item>
       <item quantity="other">Alcune app stanno consumando la batteria</item>
-      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> sta consumando la batteria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Senza ottimizzazione"</string>
     <string name="high_power_on" msgid="8778058701270819268">"Senza ottimizzazione"</string>
@@ -4466,8 +4470,8 @@
     <string name="free_memory" msgid="439783742246854785">"Memoria disponibile"</string>
     <string name="memory_usage_apps" msgid="5776108502569850579">"Memoria utilizzata dalle app"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> app hanno utilizzato la memoria nelle ultime <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="one">1 app ha utilizzato la memoria nelle ultime <xliff:g id="DURATION_0">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Frequenza"</string>
     <string name="memory_maximum_usage" msgid="2047013391595835607">"Utilizzo massimo"</string>
@@ -4544,8 +4548,8 @@
     <string name="data_usage_summary_format" msgid="6844301859713164522">"<xliff:g id="AMOUNT">%1$s</xliff:g> di dati utilizzati"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"Dati utilizzati su Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
+      <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Disattivate per <xliff:g id="COUNT">%d</xliff:g> app</item>
-      <item quantity="one">Disattivate per 1 app</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Attive per tutte le app"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> app installate"</string>
@@ -4612,12 +4616,12 @@
     <string name="suggestions_summary" msgid="1709710458908440469">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestions_more_title" msgid="240124526378997009">"+ altri <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
-      <item quantity="one">1 suggerimento</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
+      <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggerimenti</item>
-      <item quantity="one">+1 suggerimento</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Rimuovi"</string>
     <string name="color_temperature" msgid="8256912135746305176">"Temperatura di colore fredda"</string>
@@ -4645,8 +4649,8 @@
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Il giorno <xliff:g id="ID_1">%1$s</xliff:g> di ogni mese"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Restrizioni di rete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrizioni</item>
-      <item quantity="one">1 restrizione</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"La misurazione dell\'operatore potrebbe differire da quella del dispositivo"</string>
     <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sono esclusi i dati usati dalle reti dell\'operatore"</string>
@@ -4660,8 +4664,8 @@
     <string name="configure" msgid="1499586749829665889">"Configura"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Altre app incluse nell\'utilizzo"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> app autorizzate a utilizzare dati senza limitazioni quando la funzione Risparmio dati è attiva</item>
-      <item quantity="one">1 app autorizzata a utilizzare dati senza limitazioni quando la funzione Risparmio dati è attiva</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Dati principali"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Dati Wi‑Fi"</string>
@@ -4672,8 +4676,8 @@
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Grafico che mostra l\'utilizzo dei dati dal giorno <xliff:g id="START_DATE">%1$s</xliff:g> al giorno <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Non ci sono dati in questo intervallo di date"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
+      <item quantity="one">%d days left</item>
       <item quantity="other">%d giorni rimanenti</item>
-      <item quantity="one">%d giorno rimanente</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Tempo scaduto"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Meno di 1 giorno rimanente"</string>
@@ -4745,8 +4749,8 @@
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Applicazione dell\'overlay non riuscita"</string>
     <string name="special_access" msgid="1767980727423395147">"Accesso speciale per le app"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono usare dati senza limitazioni</item>
-      <item quantity="one">1 app può usare dati senza limitazioni</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Altro"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Vuoi cancellare i dati utente e convertire in crittografia dei file?"</string>
@@ -4785,16 +4789,16 @@
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Calendario di più profili"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Mostra gli eventi di lavoro sul tuo calendario personale"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ore</item>
-      <item quantity="one">1 ora</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minuti</item>
-      <item quantity="one">1 minuto</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
-      <item quantity="one">1 secondo</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gestisci archiviazione"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
@@ -4898,7 +4902,7 @@
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"Il tuo spazio di archiviazione è ora gestito dalla Gestione memoria"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"Account di <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"Configurazione"</string>
-    <string name="auto_sync_account_title" msgid="1070908045600374254">"Sincronizza automaticamente dati app"</string>
+    <string name="auto_sync_account_title" msgid="1070908045600374254">"Sincronizza automaticamente i dati delle app"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"Sincronizza i dati personali automaticamente"</string>
     <string name="auto_sync_work_account_title" msgid="6060310415978781885">"Sincronizza i dati di lavoro automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"Consenti aggiornamento automatico dei dati delle app"</string>
@@ -4923,16 +4927,16 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"App installate"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Il numero delle app è una stima e potrebbe non includere le app installate all\'esterno del Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> app</item>
-      <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorizzazioni di accesso alla posizione"</string>
     <string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Autorizzazioni microfono"</string>
     <string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Autorizzazioni fotocamera"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"App predefinite"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Tastiera predefinita"</string>
     <string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Metodo impostato: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4944,16 +4948,16 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Credenziali attendibili nel profilo personale"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Credenziali attendibili nel profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Minimo <xliff:g id="COUNT_1">%d</xliff:g> certificati CA</item>
-      <item quantity="one">Minimo <xliff:g id="COUNT_0">%d</xliff:g> certificato CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'amministratore può bloccare il dispositivo e reimpostare la password"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"L\'amministratore può eliminare tutti i dati del dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione di tutti i dati del dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione dei dati del profilo di lavoro"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativi</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativo</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Questo dispositivo è gestito dalla tua organizzazione."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
@@ -4968,19 +4972,19 @@
     <string name="financed_privacy_failed_password_wipe_device" msgid="8777230427603977667">"Tentativi di inserimento della password non riusciti prima dell\'eliminazione dei dati del dispositivo"</string>
     <string name="financed_privacy_header" msgid="7215645340918406124">"Il tuo fornitore di credito può modificare le impostazioni e installare software su questo dispositivo.\n\nPer saperne di più, contatta il fornitore di credito."</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
+      <item quantity="one">Camera apps</item>
       <item quantity="other">App Fotocamera</item>
-      <item quantity="one">App Fotocamera</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"App di calendario"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"App di contatti"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
+      <item quantity="one">Email client apps</item>
       <item quantity="other">App client di posta</item>
-      <item quantity="one">App client di posta</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"App di mappe"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
+      <item quantity="one">Phone apps</item>
       <item quantity="other">App Telefono</item>
-      <item quantity="one">App Telefono</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -5016,8 +5020,8 @@
     <string name="autofill_app" msgid="7595308061826307921">"Compilazione automatica"</string>
     <string name="autofill_passwords" msgid="6708057251459761083">"Password"</string>
     <plurals name="autofill_passwords_count" formatted="false" msgid="7715009165029452622">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> password</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> password</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> password</item>
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"automatica, compilazione, compilazione automatica, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che appare sullo schermo per stabilire quali contenuti possono essere compilati automaticamente."</string>
@@ -5196,8 +5200,8 @@
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Chiedi ogni volta"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Aggiungi una rete"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> SIM</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIM</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Predefinita per le chiamate"</string>
     <string name="default_for_sms" msgid="1316988329407434771">"Predefinita per SMS"</string>
@@ -5245,7 +5249,7 @@
     <string name="register_automatically" msgid="5208258089316657167">"Registrazione automatica…"</string>
     <string name="roaming_alert_title" msgid="9052791521868787985">"Consentire il roaming dei dati?"</string>
     <string name="roaming_check_price_warning" msgid="5876977438036791361">"Verifica i costi con il tuo fornitore di rete."</string>
-    <string name="mobile_data_usage_title" msgid="2047864499317759728">"Utilizzo dati dell\'app"</string>
+    <string name="mobile_data_usage_title" msgid="2047864499317759728">"Utilizzo dati delle app"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"Modalità di rete <xliff:g id="NETWORKMODEID">%1$d</xliff:g> non valida. Ignora."</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Nomi punti di accesso"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
@@ -5290,7 +5294,7 @@
     <string name="dsds_notification_after_suw_title" msgid="3738898232310273982">"Configura l\'altra SIM"</string>
     <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Scegli la SIM attiva o usa due SIM contemporaneamente"</string>
     <string name="choose_sim_title" msgid="4804689675237716286">"Scegli un numero da utilizzare"</string>
-    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{È disponibile 1 numero su questo dispositivo, ma è possibile usarne solo uno alla volta}=2{Sono disponibili 2 numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}other{Sono disponibili # numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}}"</string>
+    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{È disponibile 1 numero su questo dispositivo, ma è possibile usarne solo uno alla volta}=2{Sono disponibili 2 numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}one{È disponibile # numero su questo dispositivo, ma è possibile usarne solo uno alla volta}other{Sono disponibili # numeri su questo dispositivo, ma è possibile usarne solo uno alla volta}}"</string>
     <string name="choose_sim_activating" msgid="9035902671985449448">"Attivazione in corso<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Al momento non è possibile attivarlo"</string>
     <string name="choose_sim_item_summary_unknown" msgid="7854314795485227568">"Numero sconosciuto"</string>
@@ -5344,13 +5348,13 @@
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"Uso autorizzazioni nelle ultime 24 ore"</string>
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Mostra tutto nella Dashboard"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> app</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> app</item>
-      <item quantity="one">1 app</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilizzo dell\'accessibilità"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
+      <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> app hanno accesso completo al tuo dispositivo</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> app hanno accesso completo al tuo dispositivo</item>
-      <item quantity="one">1 app ha accesso completo al tuo dispositivo</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Cambia uscita"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="6998758947764222915">"Attualmente in riproduzione sul dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -5549,7 +5553,7 @@
     <string name="mic_toggle_title" msgid="265145278323852547">"Accesso al microfono"</string>
     <string name="sensor_toggle_description" msgid="8248823248606795411">"Per tutte le app e tutti i servizi"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"Impostazioni di gioco"</string>
-    <string name="game_settings_summary" msgid="2548056479103747555">"Viene attivata la scorciatoia del Pannello di gioco e non solo"</string>
+    <string name="game_settings_summary" msgid="2548056479103747555">"Viene attivata la scorciatoia del Pannello di gioco e altro"</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"Indietro"</string>
     <string name="next_page_content_description" msgid="1641835099813416294">"Avanti"</string>
     <string name="colors_viewpager_content_description" msgid="2591751086138259565">"Anteprima colore"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 31a8fd3..89efdcc 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -266,7 +266,7 @@
     <item msgid="6485000384018554920">"עוצמת קול של צלצול"</item>
     <item msgid="3378000878531336372">"עוצמת קול של מדיה"</item>
     <item msgid="5272927168355895681">"עוצמת קול של התרעה"</item>
-    <item msgid="4422070755065530548">"עוצמת קול של התראה"</item>
+    <item msgid="4422070755065530548">"עוצמת הקול של השעון המעורר"</item>
     <item msgid="3250654589277825306">"‏עוצמת קול של Bluetooth"</item>
     <item msgid="4212187233638382465">"שמירה במצב פעיל"</item>
     <item msgid="5099026183238335900">"עקוב אחר מיקום"</item>
@@ -332,7 +332,7 @@
     <item msgid="4722479281326245754">"עוצמת קול של דיבור"</item>
     <item msgid="6749550886745567276">"עוצמת קול של צלצול"</item>
     <item msgid="2218685029915863168">"עוצמת קול של מדיה"</item>
-    <item msgid="4266577290496513640">"עוצמת קול של התראה"</item>
+    <item msgid="4266577290496513640">"עוצמת הקול של השעון המעורר"</item>
     <item msgid="8608084169623998854">"עוצמת קול של התראות"</item>
     <item msgid="7948784184567841794">"‏עוצמת קול של Bluetooth"</item>
     <item msgid="1148968792599973150">"השארה במצב פעיל"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 581e690..b048ff6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -861,6 +861,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ייתכן שתצטרך להקליד את קוד הגישה הזה גם במכשיר השני."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ייתכן שתצטרך להקליד את המפתח הזה גם במכשיר השני."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ודא שהמכשיר מציג סיסמה זו:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"עליך לאשר התאמה עם הקבוצה המתואמת"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏מאת:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;לבצע התאמה עם מכשיר זה?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏כדי להתאים עם:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>יש הקלד בו:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ולאחר מכן להקיש על Return או Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"אישור גישה אל אנשי הקשר והיסטוריית השיחות"</string>
@@ -894,6 +895,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"לא ניתן להתחבר. יש לנסות שוב."</string>
     <string name="device_details_title" msgid="1155622417516195481">"פרטי המכשיר"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"‏כתובת המכשיר לחיבור דרך Bluetooth‏: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"‏כתובת המכשיר לחיבור דרך Bluetooth:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"לשכוח את המכשיר?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"הסרת השיוך"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"האם לנתק את האפליקציה?"</string>
@@ -926,6 +928,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"לא לשכוח הגדרות"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"‏מקסימום התקני אודיו המחוברים באמצעות Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"‏בחירת מספר מקסימלי של התקני אודיו המחוברים באמצעות Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏יומן ניפוי באגים של מקבץ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏העלאת רמת הרישום של מקבץ NFC ביומן"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"‏העברה (cast)"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"‏העברה (csat)"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"‏הפעלת תצוגת WiFi"</string>
@@ -1933,7 +1937,7 @@
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"מידע על הטאבלט"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"מידע על הטלפון"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"מידע על המכשיר"</string>
-    <string name="about_settings" product="emulator" msgid="2516560858771320366">"מידע על מכשיר במדמה"</string>
+    <string name="about_settings" product="emulator" msgid="2516560858771320366">"מידע על מכשיר בגרסת האמולטור"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"הצגת מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="7509900979811934843">"מידע משפטי"</string>
     <string name="contributors_title" msgid="7965640251547037965">"תורמים"</string>
@@ -2061,7 +2065,7 @@
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"ניהול והסרה של אפליקציות מותקנות"</string>
     <string name="applications_settings" msgid="1941993743933425622">"פרטי אפליקציות"</string>
     <string name="applications_settings_summary" msgid="8206066893744768531">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
-    <string name="applications_settings_header" msgid="3154670675856048015">"הגדרות אפליקציה"</string>
+    <string name="applications_settings_header" msgid="3154670675856048015">"הגדרות של אפליקציות"</string>
     <string name="install_applications" msgid="3921609656584369901">"מקורות לא ידועים"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"אפליקציות ממקורות שונים"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"אפליקציות שפתחת לאחרונה"</string>
@@ -2732,9 +2736,9 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"שימוש מוגבר בסוללה"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"הצגת האפליקציות המובילות במידת השימוש בסוללה"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"הטעינה מוגבלת זמנית"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"לשמירה על חיי הסוללה. מידע נוסף."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"כדי לשמור על תקינות הסוללה. מידע נוסף."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"המשך הטעינה"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"במצבים מסוימים, כמו טמפרטורה גבוהה וטעינה במשך הרבה זמן, יכול להיות שתהיה הגבלה של <xliff:g id="PERCENT">%1$s</xliff:g> על הטעינה כדי לשמור על תקינות הסוללה.\n\nכשמצבים כאלה מסתיימים, טעינת הטלפון תחזור למצב הרגיל באופן אוטומטי."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"בתנאים מסוימים, למשל בטמפרטורה גבוהה או כשטעינה נמשכת הרבה זמן, יכול להיות שהיא תוגבל ל-<xliff:g id="PERCENT">%1$s</xliff:g> כדי לשמור על תקינות הסוללה.\n\nכשהתנאים ישתנו בחזרה, הטלפון יחזור להיטען כרגיל באופן אוטומטי."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"במצבים מסוימים, כמו טמפרטורה גבוהה וטעינה במשך הרבה זמן, יכול להיות שתהיה הגבלה של <xliff:g id="PERCENT">%1$s</xliff:g> על הטעינה כדי לשמור על תקינות הסוללה.\n\nכשמצבים כאלה מסתיימים, טעינת הטאבלט תחזור למצב הרגיל באופן אוטומטי."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"נעשה שימוש רב מהרגיל בטלפון שלך. לכן, ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\nהאפליקציות המובילות בצריכת סוללה:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"נעשה שימוש רב מהרגיל בטאבלט שלך. לכן, ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\nהאפליקציות המובילות בצריכת סוללה:"</string>
@@ -3460,7 +3464,7 @@
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"הבנתי"</string>
     <string name="nfc_more_title" msgid="1041094244767216498">"עוד…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"הגדרה של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
-    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
+    <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון אפליקציית התשלום הראשית"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"במסוף תשלום ללא מגע, יש לשלם באמצעות <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"במסוף ללא מגע, יש לשלם באמצעות <xliff:g id="APP_0">%1$s</xliff:g>.\n\nהאפליקציה הזו מחליפה את <xliff:g id="APP_1">%2$s</xliff:g> כאפליקציית התשלומים שתשמש כברירת מחדל."</string>
     <string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"הגדרה כברירת מחדל"</string>
@@ -3934,7 +3938,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"איך להציג התראות פרופיל כשהמכשיר נעול?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"התראות פרופיל"</string>
     <string name="notifications_title" msgid="4221655533193721131">"התראות"</string>
-    <string name="app_notifications_title" msgid="248374669037385148">"התראות מאפליקציות"</string>
+    <string name="app_notifications_title" msgid="248374669037385148">"התראות מהאפליקציה"</string>
     <string name="notification_channel_title" msgid="8859880871692797611">"קטגוריית התראות"</string>
     <string name="notification_group_title" msgid="7525666535695631538">"קבוצת קטגוריות של התראות"</string>
     <string name="notification_importance_title" msgid="1545158655988342703">"התנהגות"</string>
@@ -5619,7 +5623,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"התכונה כבויה"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"אינטרנט"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"‏כרטיסי SIM"</string>
-    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏איתור של רשתות Wi-Fi וחיבור אליהן"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏איתור רשתות Wi-Fi והתחברות אליהן"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"טיסה, בטוח לטיסה"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"‏שיחות והודעות SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"‏שיחות Wi-Fi"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7a03c44..872db72 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"もう一方のデバイスでも、このPINの入力が必要な場合があります。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"もう一方のデバイスでも、このパスキーの入力が必要な場合があります。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"次のデバイスをペアに設定する場合:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;次のパスキーが表示されていることを確認してください:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認すると、調整された設定でペア設定します"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"発信元:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;このデバイスをペアに設定しますか？"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>をペアに設定するには、「<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>」と入力してから、ReturnキーまたはEnterキーを押します。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"連絡先と通話履歴へのアクセスを許可する"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"接続できませんでした。もう一度お試しください。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"デバイスの詳細"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"デバイスの Bluetooth アドレス: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"デバイスの Bluetooth アドレス:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"このデバイスとのペア設定を解除しますか？"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"関連付けを削除"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"アプリの接続を解除しますか？"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"設定を保存"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"接続できる Bluetooth オーディオ デバイスの上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"接続できる Bluetooth オーディオ デバイス数の上限の選択"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC スタック デバッグログ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC スタック ロギングレベルを増やす"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"キャスト"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ミラー"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ワイヤレス ディスプレイの有効化"</string>
@@ -2646,8 +2650,8 @@
     <string name="advanced_battery_title" msgid="3005993394776555079">"バッテリー使用量"</string>
     <string name="history_details_title" msgid="8628584613889559355">"履歴の詳細"</string>
     <string name="advanced_battery_preference_title" msgid="3017771848679952419">"バッテリー使用量"</string>
-    <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"過去 24 時間の使用状況を表示します"</string>
-    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"前回のフル充電からの使用状況を表示します"</string>
+    <string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"過去 24 時間の使用状況を表示する"</string>
+    <string name="advanced_battery_preference_summary" msgid="6088389774708000305">"前回のフル充電からの使用状況を表示する"</string>
     <string name="battery_details_title" msgid="4531369291819754178">"電池の使用状況"</string>
     <string name="details_subtitle" msgid="2550872569652785527">"使用状況の詳細"</string>
     <string name="controls_subtitle" msgid="3759606830916441564">"消費電力の調整"</string>
@@ -2954,7 +2958,7 @@
     <string name="credentials_install" msgid="3933218407598415827">"証明書のインストール"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ストレージから証明書をインストールする"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"証明書をSDカードからインストールする"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"認証ストレージの消去"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"認証情報の消去"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"証明書をすべて削除する"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"信頼できる認証情報"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"信頼できるCA証明書を表示する"</string>
@@ -3506,7 +3510,7 @@
     <string name="account_dashboard_title" msgid="8228773251948253914">"パスワードとアカウント"</string>
     <string name="account_dashboard_default_summary" msgid="1730719656099599488">"保存されているパスワード、自動入力、同期されているアカウント"</string>
     <string name="app_default_dashboard_title" msgid="4071015747629103216">"デフォルトのアプリ"</string>
-    <string name="system_dashboard_summary" msgid="7400745270362833832">"言語、操作、時間、バックアップ"</string>
+    <string name="system_dashboard_summary" msgid="7400745270362833832">"言語、ジェスチャー、時間、バックアップ"</string>
     <string name="search_results_title" msgid="3360639917793022533">"設定"</string>
     <string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, ネットワーク接続, インターネット, ワイヤレス, データ, wi fi"</string>
     <string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi 通知, wifi 通知"</string>
@@ -5549,7 +5553,7 @@
     <string name="mic_toggle_title" msgid="265145278323852547">"マイクへのアクセス"</string>
     <string name="sensor_toggle_description" msgid="8248823248606795411">"すべてのアプリとサービスにアクセスを許可する"</string>
     <string name="game_settings_title" msgid="1028178627743422090">"ゲームの設定"</string>
-    <string name="game_settings_summary" msgid="2548056479103747555">"ゲーム ダッシュボード ショートカットやその他の機能を有効にします"</string>
+    <string name="game_settings_summary" msgid="2548056479103747555">"ゲーム ダッシュボード ショートカットやその他の機能を有効にする"</string>
     <string name="previous_page_content_description" msgid="6438292457923282991">"前へ"</string>
     <string name="next_page_content_description" msgid="1641835099813416294">"次へ"</string>
     <string name="colors_viewpager_content_description" msgid="2591751086138259565">"色のプレビュー"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 38fad4e..6862d96 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -392,7 +392,7 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"გამოიყენეთ სახე ტელეფონის განსაბლოკად ან აპებში ავტორიზაციისთვის, მაგალითად, როცა სისტემაში შედიხართ ან შეძენას ადასტურებთ.\n\nგაითვალისწინეთ:\nერთდროულად მხოლოდ ერთი სახის დაყენება შეიძლება. სხვა სახის დასაყენებლად, წაშალეთ ამჟამინდელი.\n\nტელეფონზე დახედვამ შეიძლება უნებლიეთ განბლოკოს ის, თქვენი სურვილის საწინააღმდეგოდ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს უცხო პირმა, თუ მას სახესთან მოგიტანთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს უცხო პირმა, რომელიც ტყუპისცალივით გგავთ."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"გამოიყენეთ სახე ტელეფონის განსაბლოკად ან აპებში ავტორიზაციისთვის, მაგალითად, როცა სისტემაში შედიხართ ან შეძენას ადასტურებთ.\n\nგაითვალისწინეთ:\nერთდროულად მხოლოდ ერთი სახის დაყენება შეიძლება. სხვა სახის დასაყენებლად, წაშალეთ ამჟამინდელი.\n\nტელეფონზე დახედვამ შეიძლება უნებლიეთ განბლოკოს ის, თქვენი სურვილის საწინააღმდეგოდ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს უცხო პირმა, თუ მას სახესთან მოგიტანთ, მაშინაც კი, თუ თვალები დახუჭული გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს უცხო პირმა, რომელიც ტყუპისცალივით გგავთ."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"გსურთ სახის მოდელის წაშლა?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"თქვენი სახის მოდელი სამუდამოდ წაიშლება. წაშლის შემდეგ ტელეფონის განბლოკვის ან აპებში ავტორიზაციისთვის დაგჭირდებათ თქვენი თითის ანაბეჭდი, ნიმუში ან პაროლი."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"თქვენი სახის მოდელი სამუდამოდ და უსაფრთხოდ წაიშლება. წაშლის შემდეგ ტელეფონის განბლოკვის ან აპებში ავტორიზაციისთვის თქვენი PIN-კოდი, ნიმუში ან პაროლი დაგჭირდებათ."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"წაიშალოს სახის მოდელი?"</string>
     <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"თქვენი სახის მოდელი სამუდამოდ წაიშლება.\n\nწაშლის შემდეგ ტელეფონის განბლოკვის ან აპებში ავტორიზაციისთვის დაგჭირდებათ თქვენი თითის ანაბეჭდი, ნიმუში ან პაროლი."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"ტელეფონის განსაბლოკად გამოიყენეთ სახით განბლოკვა"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"შესაძლოა პინის შეყვანა სხვა მოწყობილობისათვისაც დაგჭირდეთ."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"შესაძლოა ამ წვდომის გასაღების სხვა მოწყობილობაში შეყვანაც დაგჭირდეთ."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-თან დასაწყვილებლად დარწმუნდით, რომ ის გიჩვენებთ წვდომის გასაღებს:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"დაადასტურეთ კოორდინირებულ ნაკრებთან დასაწყვილებლად"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;-ისგან. დაწყვილდეს ამ მოწყობილობასთან?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-თან დასაწყვილებლად დაბეჭდეთ მასზე:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, შემდეგ დააწკაპუნეთ ღილაკზე Return ან Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"კონტაქტებსა და საუბრის ისტორიაზე წვდომის დაშვება"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"დაკავშირება ვერ მოხერხდა. ცადეთ ხელახლა."</string>
     <string name="device_details_title" msgid="1155622417516195481">"მოწყობილობის დეტალები"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"მოწყობილობის Bluetooth მისამართი: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"მოწყობილობის Bluetooth მისამართი:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"გსურთ მოწყობილობის დავიწყება?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"კავშირის ამოშლა"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"გაწყდეს აპთან კავშირი?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"პარამეტრების დამახსოვრება"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"აირჩიეთ დაკავშირებულ Bluetooth აუდიო-მოწყობილობათა მაქსიმალური რიცხვი"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC დასტის ხარვეზების გამართვის ჟურნალი"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC დასტის ჟურნალის დონის გაზრდა"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ტრანსლირება"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"გამოსახულების ასლი"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"უსადენო ეკრანის ჩართვა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index bf8fe2b..c2e232a 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -392,7 +392,7 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, аккаунтқа кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады.\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Телефон құлпын ашу немесе қолданбаларда аутентификациядан өту (мысалы, аккаунтқа кіру немесе сатып алу транзакциясын растау кезінде) үшін бет үлгісін пайдаланыңыз.\n\nЕсіңізде болсын:\nбір уақытта тек бір бет үлгісін реттей аласыз. Басқа бет үлгісін қосу үшін сақталып тұрғанын жойыңыз.\n\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылуы мүмкін.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та, оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефон құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Бет үлгісін жою керек пе?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Бет үлгіңіз біржола әрі қауіпсіз жойылады. Оны жойған соң, телефон құлпын ашу немесе қолданбаларда аутентификациялану үшін PIN кодын, өрнекті немесе құпия сөзді пайдалану керек болады."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Бет үлгісі біржола әрі қауіпсіз жойылады. Жойылғаннан кейін, телефон құлпын ашу немесе қолданбаларда аутентификациядан өту үшін PIN коды, өрнек немесе құпия сөз қажет болады."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"Бет үлгісін жою керек пе?"</string>
     <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"Бет үлгісі біржола әрі қауіпсіз жойылады.\n\nОны жойған соң, телефоныңыздың құлпын ашу немесе қолданбаларда аутентификациялау үшін саусақ ізін, PIN кодын, өрнекті немесе құпия сөзді пайдалану керек болады."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Телефон құлпын ашу үшін бет тану функциясын пайдаланыңыз."</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Бұл PIN кодты басқа құрылғыда да теру қажет болуы мүмкін."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Бұл кілтпернені басқа құрылғыларды қолданғанда да теру қажет болады."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Жұпталу үшін:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Оның келесі кілтсөзді көрсетуін қадағалаңыз:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Үйлестірілген жинақпен жұптауды растаңыз."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Келесі құрылғыдан:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Осы құрылғымен жұпталсын ба?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Жұпталу үшін:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Теріңіз:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, одан кейін Оралу немесе Енгізу пәрменін басыңыз."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Контактілер мен қоңыраулар тарихына кіруге рұқсат беру"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Қосылмады. Әрекетті қайталаңыз."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Құрылғы мәліметтері"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Құрылғының Bluetooth мекенжайы: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Құрылғының Bluetooth мекенжайы:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Құрылғы ұмытылсын ба?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Байланысты жою"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Қолданбаны ажырату керек пе?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Параметрлерді есте сақтау"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Байланыстырылған Bluetooth аудиоқұрылғылардың максималды санын таңдау"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC стэгінің түзету журналы"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC стэгін тіркеу деңгейін арттыру"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"айна"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Сымсыз дисплейді қосу"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 4c47902..45a2272 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"អ្នក​ក៏​ត្រូវ​បញ្ចូល​កូដ PIN នេះ​លើ​ឧបករណ៍​ផ្សេង​ដែរ។"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"អ្នក​ក៏​អាច​ត្រូវ​បញ្ចូល​លេខ​កូដ​នេះ​លើ​ឧបករណ៍​ផ្សេង។"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ប្រាកដ​ថា វា​កំពុង​បង្ហាញ​​លេខ​កូដ​នេះ៖&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"បញ្ជាក់ ដើម្បីផ្គូផ្គងជាមួយសំណុំដែលបានសម្របសម្រួល"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ពី៖ &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ផ្គូផ្គង​ជា​មួយ​ឧបករណ៍​នេះ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ដើម្បី​ផ្គូផ្គង​ជា​មួយ៖ <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>វាយ​បញ្ចូល៖ <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> បន្ទាប់​មក​ចុច​ Return ឬ Enter ។"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ផ្ដល់​សិទ្ធិ​អនុញ្ញាត​ចូល​ប្រើ​ទំនាក់ទំនង​ និង​ប្រវត្តិ​ហៅ​ទូរសព្ទ​របស់អ្នក"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"មិនអាចភ្ជាប់បានទេ។ សូមព្យាយាមម្តងទៀត។"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ព័ត៌មានលម្អិត​អំពី​ឧបករណ៍"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖ <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"អាសយដ្ឋាន​ប៊្លូធូស​របស់ឧបករណ៍៖\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"បំភ្លេច​ឧបករណ៍?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ដកភាពពាក់ព័ន្ធចេញ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ផ្ដាច់​កម្មវិធីឬ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ចងចាំ​ការ​កំណត់"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស​"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ជ្រើសរើស​ចំនួនអតិបរមា​នៃ​ឧបករណ៍​សំឡេង​ដែលភ្ជាប់​ប៊្លូធូស"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"កំណត់ហេតុ​ជួសជុលគំនរ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"បង្កើន​កម្រិតធ្វើ​កំណត់ហេតុ​គំនរ NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ភ្ជាប់"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"កញ្ចក់"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"បើក​ការ​បង្ហាញ​ឥត​ខ្សែ"</string>
@@ -2667,7 +2671,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"មុខងារ​មួយចំនួន​អាច​ត្រូវ​បានដាក់កំហិត"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"ការប្រើប្រាស់ថ្មខ្ពស់ជាងមុន"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"មើលកម្មវិធី​ដែលមាន​ការប្រើប្រាស់ខ្ពស់បំផុត"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"បានដាក់កម្រិត​ការសាកថ្មជា​បណ្ដោះអាសន្ន"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"បានដាក់កំហិតលើ​ការសាកថ្មជា​បណ្ដោះអាសន្ន"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"ដើម្បីរក្សា​ថ្មរបស់អ្នក។ ស្វែងយល់​បន្ថែម។"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"បន្តសាកថ្ម"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"ក្នុងស្ថានភាពមួយចំនួន ដូចជាសីតុណ្ហភាពខ្ពស់ និងរយៈពេលសាកថ្មយូរ ការសាកថ្មអាចត្រូវបានដាក់កំហិតត្រឹម <xliff:g id="PERCENT">%1$s</xliff:g> ដើម្បីជួយការពារ​គុណភាពថ្ម។\n\nនៅពេលដែលស្ថានភាពទាំងនោះបញ្ចប់ ទូរសព្ទរបស់អ្នកនឹងសាកថ្មដូចធម្មតាដោយស្វ័យប្រវត្តិវិញ។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 89bb431..0f638fa 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ನಿಮಗೆ ಇತರ ಸಾಧನದಲ್ಲಿ ಈ ಪಿನ್‌ ಟೈಪ್‌ ಮಾಡುವ ಅಗತ್ಯವಿರಬಹುದು."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ನಿಮಗೆ ಇತರ ಸಾಧನದಲ್ಲಿ ಈ ಪಾಸ್‌ಕೀಯನ್ನು ಟೈಪ್‌ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ಇದು ಈ ಪಾಸ್‌ಕೀ ಅನ್ನು ತೋರಿಸುತ್ತಿದೆಯೇ ಎಂಬುದನ್ನು ಖಾತ್ರಿಪಡಿಸಿಕೊಳ್ಳಿ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ಸಂಯೋಜಿತ ಪ್ಯಾಕೇಜ್‌ನಲ್ಲಿರುವ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಜೋಡಿಸುವುದನ್ನು ಮರೆಯದಿರಿ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ಇದರಿಂದ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ಈ ಸಾಧನದೊಂದಿಗೆ ಜೋಡಿಸುವುದೇ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ಇದರೊಂದಿಗೆ ಜೋಡಿಸಲು:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ಇದರಲ್ಲಿ ಟೈಪ್‌ ಮಾಡಿ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ನಂತರ ಹಿಂತಿರುಗು ಅಥವಾ ನಮೂದಿಸು ಒತ್ತಿರಿ."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ಸಾಧನದ ವಿವರಗಳು"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ಸಾಧನವನ್ನು ಮರೆತಿದ್ದೀರಾ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ಅಸೋಸಿಯೇಷನ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ಆ್ಯಪ್ ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡುವುದೇ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೆನಪಿನಲ್ಲಿಡು"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ಗರಿಷ್ಠ ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ಸಂಪರ್ಕಿತ ಬ್ಲೂಟೂತ್ ಆಡಿಯೋ ಸಾಧನಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ಸ್ಟ್ಯಾಕ್ ಡೀಬಗ್‌ಲಾಗ್"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ಸ್ಟ್ಯಾಕ್ ಲಾಗಿಂಗ್ ಹಂತವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ಬಿತ್ತರಿಸುವಿಕೆ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ಕನ್ನಡಿ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -2667,7 +2671,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"ಕೆಲವು ವೈಶಿಷ್ಟ್ಯಗಳು ಸೀಮಿತವಾಗಿರಬಹುದು"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"ಹೆಚ್ಚಿನ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"ಅತ್ಯಂತ ಹೆಚ್ಚು ಬಳಸಲಾದ ಆ್ಯಪ್‌ಗಳನ್ನು ನೋಡಿ"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ಚಾರ್ಜಿಂಗ್ ತಾತ್ಕಾಲಿಕವಾಗಿ ಸೀಮಿತವಾಗಿದೆ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ಚಾರ್ಜಿಂಗ್ ಅನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸೀಮಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ಉಳಿಸಲು. ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"ಚಾರ್ಜಿಂಗ್ ಪುನರಾರಂಭಿಸಿ"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"ಹೆಚ್ಚಿನ ತಾಪಮಾನ ಮತ್ತು ದೀರ್ಘ ಚಾರ್ಜಿಂಗ್ ಅವಧಿಯಂತಹ ಕೆಲವು ಪರಿಸ್ಥಿತಿಗಳಲ್ಲಿ ಬ್ಯಾಟರಿಯ ಆರೋಗ್ಯವನ್ನು ರಕ್ಷಿಸಲು ಚಾರ್ಜಿಂಗ್ <xliff:g id="PERCENT">%1$s</xliff:g> ಗೆ ಸೀಮಿತವಾಗಿದೆ.\n\nಆ ಪರಿಸ್ಥಿತಿಗಳು ಮುಗಿದ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಸಾಮಾನ್ಯವಾಗಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಚಾರ್ಜ್ ಆಗುತ್ತದೆ."</string>
@@ -4971,7 +4975,7 @@
       <item quantity="one">ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
       <item quantity="other">ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"ಕ್ಯಾಲೆಂಡರ್ ಅಪ್ಲಿಕೇಶನ್"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">ಇಮೇಲ್ ಕ್ಲೈಂಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9f4947c..ee2fabb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -303,7 +303,7 @@
       <item quantity="one">사용 - <xliff:g id="COUNT_0">%1$d</xliff:g>개의 앱이 위치에 액세스할 수 있음</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"로드 중…"</string>
-    <string name="location_settings_footer_general" msgid="1040507068701188821">"근처 기기 권한이 있는 앱이 연결된 기기의 상대적인 위치를 파악할 수 있습니다."</string>
+    <string name="location_settings_footer_general" msgid="1040507068701188821">"근처 기기 액세스 권한이 있는 앱은 연결된 기기의 상대적인 위치를 파악할 수 있습니다."</string>
     <string name="location_settings_footer_location_off" msgid="8568995909147566720">"앱 및 서비스에 대한 위치 정보 액세스가 사용 중지되어 있습니다. 그래도 긴급 전화번호로 전화를 걸거나 문자 메시지를 보내면 기기의 위치 정보가 구조 서비스에 전달될 수 있습니다."</string>
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"위치 설정 자세히 알아보기"</string>
     <string name="account_settings_title" msgid="9138880127246241885">"계정"</string>
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"또한 다른 기기에 이 PIN을 입력해야 할 수도 있습니다."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"또한 경우에 따라 다른 기기에 이 패스키를 입력해야 합니다."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;이 패스키(&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;)가 표시되는지 확인하세요.&lt;br&gt;&lt;br&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"통합 세트와의 페어링 확인"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"출처:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;이 기기와 페어링하시겠습니까?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>와(과) 페어링하려면 <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>을(를) 입력한 다음 Return 또는 Enter 키를 누르세요."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"연락처 및 통화 기록 액세스 허용"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"연결할 수 없습니다. 다시 시도해 주세요."</string>
     <string name="device_details_title" msgid="1155622417516195481">"기기 세부정보"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"기기 블루투스 주소: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"기기 블루투스 주소: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"기기를 지우시겠습니까?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"연결 삭제"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"앱 연결을 해제할까요?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"설정 기억"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"연결된 블루투스 오디오 기기의 최대 개수"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"연결된 블루투스 오디오 기기의 최대 개수 선택"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 스택 디버그 로그"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC 스택 로깅 수준 높이기"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"전송"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"미러링"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"무선 디스플레이 사용"</string>
@@ -1594,7 +1598,7 @@
     <string name="storage_menu_manage" msgid="7465522758801346408">"저장용량 관리"</string>
     <string name="keywords_storage_menu_free" msgid="2275406357317597106">"삭제, 저장용량"</string>
     <string name="storage_free_up_space_title" msgid="281047807372131975">"여유 공간 확보"</string>
-    <string name="storage_free_up_space_summary" msgid="6650027929735481350">"Files 앱으로 이동하여 저장공간을 관리하고 여유 공간을 확보합니다."</string>
+    <string name="storage_free_up_space_summary" msgid="6650027929735481350">"저장공간을 관리하고 여유 공간을 확보하려면 Files 앱으로 이동하세요."</string>
     <string name="storage_title_usb" msgid="1332488715547400452">"USB 컴퓨터 연결"</string>
     <string name="usb_connection_category" msgid="2288543238378907242">"다음으로 연결"</string>
     <string name="usb_mtp_title" msgid="9068009584556422314">"미디어 기기(MTP)"</string>
@@ -2054,7 +2058,7 @@
     <string name="data_size_label" msgid="7814478940141255234">"사용자 데이터"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="1054860423004751290">"USB 저장소 데이터"</string>
     <string name="external_data_size_label" product="default" msgid="3370825186202856353">"SD 카드"</string>
-    <string name="uninstall_text" msgid="315764653029060126">"설치 제거"</string>
+    <string name="uninstall_text" msgid="315764653029060126">"제거"</string>
     <string name="uninstall_all_users_text" msgid="5924715251087176474">"모든 사용자에 대해 제거"</string>
     <string name="install_text" msgid="4558333621516996473">"설치"</string>
     <string name="disable_text" msgid="5146002260857428005">"사용 안함"</string>
@@ -2670,9 +2674,9 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"배터리 사용량이 증가함"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"배터리 사용량이 가장 높은 앱을 확인하세요"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"충전이 일시적으로 제한됨"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"배터리 수명을 연장하는 방법입니다. 자세히 알아보세요."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"배터리 보호를 위한 조치입니다. 자세히 알아보세요."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"충전 재개"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"온도가 높거나 충전 시간이 긴 경우 등 특정한 상황에서는 배터리 보호를 위해 <xliff:g id="PERCENT">%1$s</xliff:g>까지만 충전될 수 있습니다.\n\n상태가 완화되면 휴대전화가 다시 자동으로 정상 충전됩니다."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"온도가 높거나 충전 시간이 긴 경우 등 특정한 상황에서는 배터리 보호를 위해 <xliff:g id="PERCENT">%1$s</xliff:g>까지만 충전될 수 있습니다.\n\n상태가 개선되면 휴대전화가 다시 자동으로 정상 충전됩니다."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"온도가 높거나 충전 시간이 긴 경우 등 특정한 상황에서는 배터리 보호를 위해 <xliff:g id="PERCENT">%1$s</xliff:g>까지만 충전될 수 있습니다.\n\n상태가 완화되면 태블릿이 다시 자동으로 정상 충전됩니다."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"휴대전화를 평소보다 더 많이 사용했기 때문에 배터리가 평소보다 더 빨리 소진될 수 있습니다.\n\n배터리 사용량이 가장 많은 앱:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"태블릿을 평소보다 더 많이 사용했기 때문에 배터리가 평소보다 더 빨리 소진될 수 있습니다.\n\n배터리 사용량이 가장 많은 앱:"</string>
@@ -3396,7 +3400,7 @@
     <string name="call_manager_title" msgid="3397433159509629466">"통화 관리자"</string>
     <!-- no translation found for call_manager_summary (2558839230880919191) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2416980110093867199">"재난문자"</string>
+    <string name="cell_broadcast_settings" msgid="2416980110093867199">"긴급 재난 문자"</string>
     <string name="network_operators_settings" msgid="5105453353329748954">"네트워크 이동통신사"</string>
     <string name="access_point_names" msgid="5768430498022188057">"액세스 포인트 이름(APN)"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="6624700245232361149">"VoLTE"</string>
@@ -3781,7 +3785,7 @@
     <string name="history_toggled_on_summary" msgid="9034278971358282728">"최근 알림 및 일시 중지된 알림이 여기에 표시됩니다."</string>
     <string name="notification_history_view_settings" msgid="5269317798670449002">"알림 설정 보기"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"알림 열기"</string>
-    <string name="snooze_options_title" msgid="2109795569568344617">"알림 일시 중지 허용"</string>
+    <string name="snooze_options_title" msgid="2109795569568344617">"다시 알림 허용"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"조용한 알림 아이콘 숨기기"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"조용한 알림 아이콘이 상태 표시줄에 표시되지 않습니다."</string>
     <string name="notification_badging_title" msgid="5469616894819568917">"앱 아이콘에 알림 표시 점 사용"</string>
@@ -4826,7 +4830,7 @@
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"동작 탐색"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"홈으로 이동하려면 화면 하단에서 위로 스와이프합니다. 앱을 전환하려면 아래에서 위로 스와이프하고 잠시 기다린 다음 손가락을 뗍니다. 뒤로 돌아가려면 왼쪽 또는 오른쪽 가장자리에서 스와이프합니다."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3버튼 탐색"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"화면 하단의 버튼을 사용하여 뒤로 돌아가고 홈으로 이동하거나 앱을 전환합니다."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"화면 하단의 버튼을 사용하여 뒤로 돌아가거나 홈으로 이동하거나 앱을 전환합니다."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"시스템 탐색, 2버튼 탐색, 3버튼 탐색, 동작 탐색, 스와이프"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"기본 홈 앱(<xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>)에서 지원하지 않는 기능입니다."</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"기본 홈 앱 전환"</string>
@@ -5434,7 +5438,7 @@
     <string name="media_controls_recommendations_title" msgid="184225835236807677">"미디어 추천 표시"</string>
     <string name="media_controls_recommendations_description" msgid="7596498733126824030">"활동을 바탕으로 추천을 받습니다."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"플레이어를 숨깁니다."</string>
-    <string name="media_controls_show_player" msgid="8504571042365814021">"플레이어를 표시합니다."</string>
+    <string name="media_controls_show_player" msgid="8504571042365814021">"플레이어 표시"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"미디어"</string>
     <string name="connected_device_see_all_summary" msgid="2056010318537268108">"블루투스를 사용 설정함"</string>
     <string name="bluetooth_setting_on" msgid="4808458394436224124">"사용"</string>
@@ -5541,7 +5545,7 @@
     <string name="enable_2g_title" msgid="8184757884636162942">"2G 허용"</string>
     <string name="enable_2g_summary" msgid="906487478332145407">"2G 모바일 데이터 연결을 사용하세요. 긴급 전화의 경우 2G가 항상 사용 설정됩니다."</string>
     <string name="show_clip_access_notification" msgid="7782300987639778542">"클립보드 액세스 표시"</string>
-    <string name="show_clip_access_notification_summary" msgid="474090757777203207">"앱이 복사된 텍스트, 이미지 또는 기타 콘텐츠에 액세스할 때 메시지를 표시합니다."</string>
+    <string name="show_clip_access_notification_summary" msgid="474090757777203207">"앱이 복사된 텍스트, 이미지 또는 기타 콘텐츠에 액세스할 때 메시지 표시"</string>
     <string name="all_apps" msgid="3054120149509114789">"모든 앱"</string>
     <string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"허용 안함"</string>
     <string name="uwb_settings_title" msgid="8578498712312002231">"초광대역(UWB)"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a0547b7..f8d1b95 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Сиз бул PIN\'ди башка түзмөккө дагы киргизишиңиз керек болушу мүмкүн."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Сиз бул сырсөздү башка түзмөккө дагы киргизишиңиз керек болушу мүмкүн."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Муну менен туташыш үчүн:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ал бул кодду көрсөтүп жатканын текшериңиз:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Координацияланган топтомго туташуу үчүн ырастаңыз"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Жөнөтүүчү:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Бул түзмөк менен туташсынбы?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Кийинки менен туташуу үчүн:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Андан муну терип:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, Return же Enter\'ди басыңыз."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Байланыштар менен чалуулар таржымалына мүмкүнчүлүк берүү"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Туташпай калды. Кайталап көрүңүз."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Түзмөктүн чоо-жайы"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Түзмөктүн Bluetooth дареги: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Түзмөктүн Bluetooth дареги:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Түзмөк унутулсунбу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Байланышты өчүрүү"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Колдонмону ажыратасызбы?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Жөндөөлөрдү эстеп калуу"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Туташып турган Bluetooth аудио түзмөктөрүнүн уруксат берилген эң жогорку саны"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Туташып турган Bluetooth аудио түзмөктөрүнүн эң жогорку санын тандоо"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Мүчүлүштүктөрдү оңдоо үчүн NFC топтомун жайгаштыруу"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC топтомун жайгаштыруу деңгээлин жогорулатуу"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Тышкы экранга чыгаруу"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"күзгү"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Зымсыз мониторду иштетүү"</string>
@@ -2269,7 +2273,7 @@
     <string name="usage_time_label" msgid="9105343335151559883">"Колдонулган убакыт"</string>
     <string name="accessibility_settings" msgid="4713215774904704682">"Атайын мүмкүнчүлүктөр"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Атайын мүмкүнчүлүктөрдүн жөндөөлөрү"</string>
-    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Дисплей, өз ара аракет, аудио"</string>
+    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Дисплей, башкаруу элементтери, аудио"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Атайн мүмкүнчлктрдн жөндлр"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Арип өлчөмүн өзгөртө аласыз"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Кубаттоо убактылуу чектелген"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Батареяңызды үнөмдөө үчүн. Кеңири маалымат."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Кубаттоону улантуу"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Батареяны көбүрөөк убакытка жеткирүү үчүн жогорку температура жана узакка кубаттоо сыяктуу айрым шарттарда кубаттоо <xliff:g id="PERCENT">%1$s</xliff:g> чейин чектелиши мүмкүн.\n\nМындай шарттар бүткөндөн кийин, телефонуңуз автоматтык түрдө кадимкидей кубаттала баштайт."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Батареяны көбүрөөк убакытка жеткирүү үчүн жогорку температура жана узакка кубаттоо сыяктуу айрым шарттарда кубаттоо <xliff:g id="PERCENT">%1$s</xliff:g> чейин чектелиши мүмкүн.\n\nМындай шарттар бүткөндөн кийин, түзмөгүңүз автоматтык түрдө кадимкидей кубаттала баштайт."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Батареяны көбүрөөк убакытка жеткирүү үчүн жогорку температурада жана узакка кубатталган шарттарда кубаттоо <xliff:g id="PERCENT">%1$s</xliff:g> чейин чектелиши мүмкүн.\n\nМындай шарттар калыбына келгенден кийин, түзмөгүңүз автоматтык түрдө кадимкидей кубаттала баштайт."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Батареяны көбүрөөк убакытка жеткирүү үчүн жогорку температурада жана узакка кубатталган шарттарда кубаттоо <xliff:g id="PERCENT">%1$s</xliff:g> чейин чектелиши мүмкүн.\n\nМындай шарттар калыбына келгенден кийин, түзмөгүңүз автоматтык түрдө кадимкидей кубаттала баштайт."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Телефонуңуз адаттагыдан көбүрөөк колдонулгандыктан, батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nБатареяны эң көп сарптап жаткан колдонмолор:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Планшетиңиз адаттагыдан көбүрөөк колдонулгандыктан, батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nБатареяны эң көп сарптап жаткан колдонмолор:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Түзмөгүңүз адаттагыдан көбүрөөк колдонулгандыктан, батареяңыз күтүлгөндөн эртерээк отуруп калышы мүмкүн.\n\nБатареяны эң көп сарптап жаткан колдонмолор:"</string>
@@ -3010,8 +3014,8 @@
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Камдык көчүрмөлөр сакталган бир дагы аккаунт табылган жок"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн, бүктөмөлөрдү, жана башка тууралоолорду, колдономолордун берилиштерин Google\'дун серверине сактоо токтотулуп, бардык көчүрмөлөр жок кылынсынбы?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр өчүрүлөт. Уланта бересизби?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
+    <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Түзмөктөгү нерселердин (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмодогу нерселердин (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр өчүрүлөт. Уланта бересизби?"</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Түзмөктөгү нерселердин (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмодогу нерселердин (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Түзмөктү башкарган колдонмонун жөндөөлөрү"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Түзмөктү башкарган колдонмо"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Түзмөктү башкарган колдонмону өчүрүп салуу"</string>
@@ -5055,7 +5059,7 @@
     <string name="angle_enabled_app_set" msgid="7811829383833353021">"ANGLE иштетилген колдонмо: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Графикалык драйвердин параметрлери"</string>
     <string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Графикалык драйвердин жөндөөлөрү өзгөрүлөт"</string>
-    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Бир нече графикалык драйвер болгондо, түзмөктө орнотулган колдонмолор үчүн жаңыртылган графикалык драйверди колдонууну тандасаңыз болот."</string>
+    <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Бир нече графикалык драйвер болгондо, түзмөктө орнотулган колдонмолор үчүн жаңырган графикалык драйверди колдонууну тандасаңыз болот."</string>
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бардык колдонмолор үчүн иштетүү"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалык драйвер тандоо"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Демейки"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d68c9ae..6f5ef27 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ທ່ານອາດຕ້ອງພິມລະຫັດ PIN ນີ້ໃສ່ອຸປະກອນອື່ນນຳ."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ທ່ານອາດຕ້ອງພິມ passkey ນີ້ໃນອຸປະກອນອື່ນນຳ"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ເພື່ອຈັບຄູ່ກັບ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ໃຫ້ກວດສອບວ່າມັນສະແດງ passkey ນີ້ຢູ່:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ຢືນຢັນເພື່ອຈັບຄູ່ກັບຊຸດທີ່ປະສານກັນ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ຈາກ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ຈັບຄູ່ກັບອຸປະກອນນີ້ບໍ່?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ເພື່ອຈັບຄູ່ກັບ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ໃຫ້ພິມ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ຈາກນັ້ນກົດ Return ຫຼື Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ປະຫວັດການໂທຂອງທ່ານ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້. ກະລຸນາລອງອີກຄັ້ງ."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ລາຍລະອຽດອຸປະກອນ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ລືມອຸປະກອນບໍ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ລຶບການເຊື່ອມໂຍງ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ຕັດການເຊື່ອມຕໍ່ແອັບບໍ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ຈື່ການຕັ້ງຄ່າ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ເລືອກຈຳນວນອຸປະກອນສຽງ Bluetooth ທີ່ເຊື່ອມຕໍ່ສູງສຸດ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"ບັນທຶກດີບັກການວາງຊ້ອນ NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"ເພີ່ມລະດັບການບັນທຶກການວາງຊ້ອນ NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ການສົ່ງສັນຍານ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ແວ່ນສະທ້ອນ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ເປີດໃຊ້ງານການສະແດງພາບໄຮ້ສາຍ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b3607fe..baa8423 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -859,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Galbūt reikės šį PIN kodą įvesti kitame įrenginyje."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Galbūt reikės šį prieigos raktą įvesti kitame įrenginyje."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Jei norite suporuoti su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Įsitikinkite, kad jame rodomas šis prieigos raktas:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Patvirtinkite, kad susietumėte su suderintu rinkiniu"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Iš:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Poruoti su šiuo įrenginiu?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Susieti su: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Įveskite: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, tada paspauskite „Grįžti“ arba „Enter“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Leisti pasiekti jūsų kontaktus ir skambučių istoriją"</string>
@@ -892,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nepavyko prisijungti. Bandykite dar kartą."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Išsami įrenginio info."</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Įrenginio „Bluetooth“ adresas: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Įrenginio „Bluetooth“ adresas:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Pamiršti įrenginį?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Pašalinti susiejimą"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Atjungti programą?"</string>
@@ -924,6 +926,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Atsiminti nustatymus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalus prijungtų „Bluetooth“ garso įrenginių skaičius"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pasirinkite maksimalų prijungtų „Bluetooth“ garso įrenginių skaičių"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC dėklo derinimo žurnalas"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Padidinti NFC dėklo įrašymo į žurnalą lygį"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Perdavimas"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ekrano vaizdo bendrinimas"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Įgalinti belaidį rodymą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 088b640..ba0b1af 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -842,6 +842,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Iespējams, šis PIN būs jāievada arī otrā ierīcē."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Iespējams, šī ieejas atslēga būs jāievada arī otrā ierīcē."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Lai savienotu pārī ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pārliecinieties, ka tiek rādīta šī ieejas atslēga:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Apstipriniet, lai savienotu pārī ar koordinēto kopu."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"No:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vai savienot pārī ar šo ierīci?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Lai izveidotu savienojumu pārī ar ierīci <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, ierakstiet tajā atslēgu <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> un pēc tam nospiediet ievadīšanas taustiņu."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Atļaut piekļuvi jūsu kontaktpersonām un zvanu vēsturei"</string>
@@ -875,6 +876,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nevarēja izveidot savienojumu. Mēģiniet vēlreiz."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Ierīces dati"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Ierīces Bluetooth adrese: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Ierīces Bluetooth adrese:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vai aizmirst ierīci?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Noņemt saistījumu"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vai atvienot lietotni?"</string>
@@ -907,6 +909,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Iegaumēt iestatījumus"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Pievienoto Bluetooth audioierīču maksimālais skaits"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pievienoto Bluetooth audioierīču maksimālā skaita atlase"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC steka atkļūdošanas žurnāls"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Palielināt NFC steka reģistrēšanas līmeni"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Apraide"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spogulis"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bezvadu attēlošanas iespējošana"</string>
@@ -1604,7 +1608,7 @@
     <string name="storage_menu_mount" msgid="4760531872302820569">"Pievienot"</string>
     <string name="storage_menu_unmount" msgid="8171552487742912282">"Noņemt"</string>
     <string name="storage_menu_format" msgid="5454870642788909443">"Formatēt"</string>
-    <string name="storage_menu_format_public" msgid="5567214442727034630">"Formatēt kā pārnēsājamu"</string>
+    <string name="storage_menu_format_public" msgid="5567214442727034630">"Formatēt kā pārnesamu"</string>
     <string name="storage_menu_format_private" msgid="3208326980027382079">"Formatēt kā iekšēju"</string>
     <string name="storage_menu_migrate" msgid="2196088149560070193">"Migrēt datus"</string>
     <string name="storage_menu_forget" msgid="5154017890033638936">"Noņemt"</string>
@@ -1624,7 +1628,7 @@
     <string name="usb_midi_summary" msgid="1842457325845863840">"Ļauj lietojumprogrammām, kurās ir iespējoti MIDI signāli, darboties kopā ar jūsu datora MIDI programmatūru, izmantojot USB savienojumu."</string>
     <string name="storage_other_users" msgid="7017206190449510992">"Citi lietotāji"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Ierīces atmiņa"</string>
-    <string name="storage_external_title" msgid="8984075540312137135">"Pārnēsājama krātuve"</string>
+    <string name="storage_external_title" msgid="8984075540312137135">"Pārnesama krātuve"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"izmantots no <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="393972242641313135">"<xliff:g id="NAME">%1$s</xliff:g> ir pievienota"</string>
@@ -1643,7 +1647,7 @@
     <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Visas lietotnes, fotoattēli un dati, kas saglabāti šajā ierīcē (<xliff:g id="NAME">^1</xliff:g>), vairs nebūs pieejami."</string>
     <string name="storage_detail_dialog_system" msgid="7461009051858709479">"Sistēmā ir ietverti faili, kas tiek izmantoti Android versijai <xliff:g id="VERSION">%s</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="9036374223934708619">"Iestatiet <xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Izmantot kā pārnēsājamu krātuvi"</string>
+    <string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Izmantot kā pārnesamu krātuvi"</string>
     <string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"Izvēloties šo opciju, varēsiet pārvietot fotoattēlus un citus datus uz citām ierīcēm."</string>
     <string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"Izmantot kā iekšējo atmiņu"</string>
     <string name="storage_wizard_init_internal_summary" msgid="2283798331883929674">"Izvēloties šo opciju, varēsiet glabāt failus (tostarp lietotnes un fotoattēlus) tikai šajā ierīcē. Tādā gadījumā krātuve ir jāformatē, lai tā darbotos tikai konkrētā ierīcē."</string>
@@ -1681,9 +1685,9 @@
     <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="3022584310096954875">"Lietotnēm, failiem un multivides saturam tikai šajā tālrunī"</string>
     <string name="storage_wizard_init_v2_internal_action" product="default" msgid="5645732875040797464">"Tālruņa krātuve"</string>
     <string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"Vai"</string>
-    <string name="storage_wizard_init_v2_external_title" msgid="8129096036551264207">"Pārnēsājamai krātuvei"</string>
+    <string name="storage_wizard_init_v2_external_title" msgid="8129096036551264207">"Pārnesamai krātuvei"</string>
     <string name="storage_wizard_init_v2_external_summary" msgid="6436419488235871823">"Failu un multivides satura pārsūtīšanai starp ierīcēm"</string>
-    <string name="storage_wizard_init_v2_external_action" msgid="781928899530539860">"Pārnēsājama krātuve"</string>
+    <string name="storage_wizard_init_v2_external_action" msgid="781928899530539860">"Pārnesama krātuve"</string>
     <string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"Iestatīt vēlāk"</string>
     <string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"Vai formatēt šo: <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"Lai saglabātu lietotnes, failus un multivides saturu, SD karte <xliff:g id="NAME_0">^1</xliff:g> ir jāformatē. \n\nFormatējot tiks dzēsts viss saturs, kas saglabāts šeit: <xliff:g id="NAME_1">^2</xliff:g>. Lai nezaudētu saturu, dublējiet to citā datu nesējā <xliff:g id="NAME_2">^3</xliff:g> vai citā ierīcē."</string>
@@ -1700,7 +1704,7 @@
     <string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"Pārvietot saturu vēlāk"</string>
     <string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"Notiek satura pārvietošana…"</string>
     <string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"<xliff:g id="NAME">^1</xliff:g> lēni darbojas"</string>
-    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"Varat turpināt lietot ierīci <xliff:g id="NAME_0">^1</xliff:g>, tomēr tā var darboties lēni. \n\nIerīcē <xliff:g id="NAME_1">^2</xliff:g> saglabātās lietotnes var darboties neatbilstoši un satura pārsūtīšanai var būt nepieciešams ilgs laiks. \n\nMēģiniet izmantot ierīci <xliff:g id="NAME_2">^3</xliff:g> ar ātrāku darbību, vai arī šo ierīci <xliff:g id="NAME_3">^4</xliff:g> izmantojiet kā pārnēsājamu krātuvi."</string>
+    <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"Varat turpināt lietot ierīci <xliff:g id="NAME_0">^1</xliff:g>, tomēr tā var darboties lēni. \n\nIerīcē <xliff:g id="NAME_1">^2</xliff:g> saglabātās lietotnes var darboties neatbilstoši un satura pārsūtīšanai var būt nepieciešams ilgs laiks. \n\nMēģiniet izmantot ierīci <xliff:g id="NAME_2">^3</xliff:g> ar ātrāku darbību, vai arī šo ierīci <xliff:g id="NAME_3">^4</xliff:g> izmantojiet kā pārnesamu krātuvi."</string>
     <string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"Sākt vēlreiz"</string>
     <string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"Tālāk"</string>
     <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"Varat pārvietot saturu uz ierīci <xliff:g id="NAME">^1</xliff:g>"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 8167693..43b16b9 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -392,7 +392,7 @@
     <string name="security_settings_face_settings_footer" msgid="625696606490947189">"Користете го вашето лице за да го отклучувате телефонот или за проверка во апликации, како на пр., кога се најавувате или одобрувате купување.\n\nИмајте предвид:\nможе да имате поставено само еден лик. За да додадете друг лик, избришете го моменталниот.\n\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, идентичен близнак."</string>
     <string name="security_settings_face_settings_footer_attention_not_supported" msgid="2071065435536235622">"Користете го вашето лице за да го отклучувате телефонот или за проверка во апликации, како на пр., кога се најавувате или одобрувате купување.\n\nИмајте предвид:\nможе да имате поставено само еден лик. За да додадете друг лик, избришете го моменталниот.\n\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик, дури и ако очите ви се затворени.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, идентичен близнак."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Да се избрише моделот на лице?"</string>
-    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Вашиот модел на лице ќе биде трајно и безбедно избришан. По бришењето, ќе ви треба PIN, шема или лозинка за да го отклучите телефонот или за проверка во апликации."</string>
+    <string name="security_settings_face_settings_remove_dialog_details" msgid="3268144215619385299">"Вашиот модел на лик ќе биде трајно и безбедно избришан. По бришењето, ќе ви треба PIN, шема или лозинка за да го отклучите телефонот или за проверка во апликации."</string>
     <string name="security_settings_face_settings_remove_model_dialog_title" msgid="7175068449513875691">"Да се избрише моделот на лице?"</string>
     <string name="security_settings_face_settings_remove_model_dialog_details" msgid="7148069244593587389">"Вашиот модел на лице ќе биде трајно и безбедно избришан.\n\nПо бришењето, ќе ви треба отпечаток, PIN, шема или лозинка за да го отклучите телефонот или за проверка во апликации."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"Користете „Отклучување со лик“ за отклучување на телефонот"</string>
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Можеби ќе треба да го внесе овој PIN и на другиот уред."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Може ќе треба да ја внесете лозинката и на другиот уред."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"За да се спари со:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Проверете дали се прикажува оваа лозинка:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потврдете за спарување со координираниот комплет"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Од:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Спари се со овој уред?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За да се спари со:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Напишете на него:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, потоа притиснете „Врати“ или „Внеси“."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволете пристап до вашите контакти и историјата на повици"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не може да се поврзе. Обидете се повторно."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Детали за уредот"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адреса на Bluetooth на уредот: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адреса на Bluetooth на уредот:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Да се заборави уредот?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Отстрани асоцијација"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Да се прекине врската со апликацијата?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомни поставки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимален број аудиоуреди поврзани преку Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изберете го максималниот број аудиоуреди поврзани преку Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Евиденција за отстранување грешки за NFC stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Зголеми го нивото на евиденција за NFC stack"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Емитувај"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"огледало"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Овозможи приказ на безжични мрежи"</string>
@@ -1824,7 +1828,7 @@
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Користете точка на пристап и врзување за да им обезбедите пристап до интернет на други уреди преку Wi‑Fi врската или врската за мобилен интернет. Апликациите исто така може да создаваат точки на пристап за да споделуваат содржини со уредите во близина."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помош"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Мобилна мрежа"</string>
-    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Мобилен план"</string>
+    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Пакет за мобилен интернет"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"Апликација за SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Избери апликација за SMS"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Да се користи <xliff:g id="NEW_APP">%1$s</xliff:g> наместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> како SMS-апликација?"</string>
@@ -1889,7 +1893,7 @@
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"За таблет"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"За телефонот"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"За уредот"</string>
-    <string name="about_settings" product="emulator" msgid="2516560858771320366">"За емулирани уреди"</string>
+    <string name="about_settings" product="emulator" msgid="2516560858771320366">"За емулираниот уред"</string>
     <string name="about_settings_summary" msgid="4831942939227432513">"Прикажи правни информации, статус, верзија на софтвер"</string>
     <string name="legal_information" msgid="7509900979811934843">"Правни информации"</string>
     <string name="contributors_title" msgid="7965640251547037965">"Соработници"</string>
@@ -2672,8 +2676,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Полнењето е привремено ограничено"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"За да се заштеди батеријата. Дознајте повеќе."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Продолжи со полнење"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"При одредени услови, како високи температури и долги периоди на полнење, полнењето може да се ограничи на <xliff:g id="PERCENT">%1$s</xliff:g> за да помогне да се зачува состојбата на батеријата.\n\nКога таквите услови ќе завршат, вашиот телефон автоматски ќе се полни нормално."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"При одредени услови, како високи температури и долги периоди на полнење, полнењето може да се ограничи на <xliff:g id="PERCENT">%1$s</xliff:g> за да помогне да се зачува состојбата на батеријата.\n\nКога таквите услови ќе завршат, вашиот таблет автоматски ќе се полни нормално."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"При одредени услови, како високи температури и долги периоди на полнење, полнењето може да се ограничи на <xliff:g id="PERCENT">%1$s</xliff:g> за да се зачува состојбата на батеријата.\n\nКога таквите услови ќе завршат, вашиот телефон автоматски ќе се полни нормално."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"При одредени услови, како високи температури и долги периоди на полнење, полнењето може да се ограничи на <xliff:g id="PERCENT">%1$s</xliff:g> за да се зачува состојбата на батеријата.\n\nКога таквите услови ќе завршат, вашиот таблет автоматски ќе се полни нормално."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Бидејќи сте го користеле телефонот повеќе од вообичаено, батеријата може да ви се потроши порано од обично.\n\nАпликации што најмногу ја користат батеријата:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Бидејќи сте го користеле таблетот повеќе од вообичаено, батеријата може да ви се потроши порано од обично.\n\nАпликации што најмногу ја користат батеријата:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Бидејќи сте го користеле уредот повеќе од вообичаено, батеријата може да ви се потроши порано од обично.\n\nАпликации што најмногу ја користат батеријата:"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f96e44c..88d0c15 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾക്ക് ഈ പിൻ ടൈപ്പുചെയ്യേണ്ടതായും വരാം."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾ ഈ പാസ്‌കീ നൽകേണ്ടതായും വരാം."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ഇതുമായി ജോടിയാക്കുന്നതിന്:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;അത് ഈ പാസ്കീ തന്നെയാണ് ദൃശ്യമാക്കുന്നതെന്ന് ഉറപ്പാക്കുക:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"കോർഡിനേറ്റഡ് സെറ്റുമായി ജോടിയാക്കാൻ സ്ഥിരീകരിക്കുക"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ഇതിൽ നിന്ന്:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ഈ ഉപകരണവുമായി ജോടിയാക്കണോ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ഇതുമായി ജോടിയാക്കുക:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ഇതിൽ ടൈപ്പുചെയ്യുക:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, തുടർന്ന് മടങ്ങുക അല്ലെങ്കിൽ നൽകുക അമർത്തുക."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"കോൺടാക്‌റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും ആക്‌സസ് അനുവദിക്കുക"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"കണക്റ്റുചെയ്യാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="device_details_title" msgid="1155622417516195481">"ഉപകരണ വിശദാംശങ്ങൾ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ഉപകരണം മറക്കണോ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ബന്ധം നീക്കം ചെയ്യുക"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ആപ്പ് വിച്‌ഛേദിക്കണോ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ക്രമീകരണങ്ങൾ ഓർമ്മിക്കുക"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"കണക്റ്റ് ചെയ്‌ത പരമാവധി Bluetooth ഓഡിയോ ഉപകരണങ്ങളുടെ എണ്ണം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC സ്റ്റാക്ക് ഡീബഗ് ലോഗ്"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC സ്റ്റാക്ക് ലോഗിംഗ് ലെവൽ ഉയർത്തുക"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"കാസ്‌റ്റ് ചെയ്യുക"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"മിറർ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"വയർലസ്‌ഡിസ്പ്ലേ സജീവമാക്കൂ"</string>
@@ -2667,9 +2671,9 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"ചില ഫീച്ചറുകൾ പരിമിതപ്പെടാം"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"ഉയർന്ന ഉപയോഗമുള്ള ആപ്പുകൾ കാണുക"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ചാർജ് ചെയ്യൽ താൽക്കാലികമായി പരിമിതപ്പെടുത്തിയിരിക്കുന്നു"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ചാർജിംഗ് താൽക്കാലികമായി പരിമിതപ്പെടുത്തിയിരിക്കുന്നു"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"നിങ്ങളുടെ ബാറ്ററി ചാർജ് നിലനിർത്താൻ. കൂടുതലറിയുക."</string>
-    <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"ചാർജ് ചെയ്യൽ പുനരാരംഭിക്കുക"</string>
+    <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"ചാർജിംഗ് പുനനരാരംഭിക്കുക"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"ഉയർന്ന താപനിലയും ദൈർഘ്യമേറിയ ചാർജിംഗ് കാലയളവും പോലുള്ള ഏതാനും സാഹചര്യങ്ങളിൽ ബാറ്ററിയുടെ ആരോഗ്യം സംരക്ഷിക്കാൻ ചാർജിംഗ് <xliff:g id="PERCENT">%1$s</xliff:g>-ലേക്ക് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു.\n\nആ സാഹചര്യങ്ങൾ അവസാനിക്കുമ്പോൾ, നിങ്ങളുടെ ഫോൺ സാധാരണ ഗതിയിൽ സ്വയമേവ ചാർജ് ചെയ്യും."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"ഉയർന്ന താപനിലയും ദൈർഘ്യമേറിയ ചാർജിംഗ് കാലയളവും പോലുള്ള ഏതാനും സാഹചര്യങ്ങളിൽ ബാറ്ററിയുടെ ആരോഗ്യം സംരക്ഷിക്കാൻ ചാർജിംഗ് <xliff:g id="PERCENT">%1$s</xliff:g>-ലേക്ക് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു.\n\nആ സാഹചര്യങ്ങൾ അവസാനിക്കുമ്പോൾ, നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സാധാരണ ഗതിയിൽ സ്വയമേവ ചാർജ് ചെയ്യും."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"നിങ്ങളുടെ ഫോൺ പതിവിൽ കൂടുതൽ ഉപയോഗിച്ചതിനാൽ സാധാരണയിലും വേഗത്തിൽ ബാറ്ററി ചാർജ് തീർന്നേക്കാം.\n\nകൂടുതൽ ബാറ്ററി ഉപയോഗിക്കുന്ന ആപ്പുകൾ:"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index dcf8544..8a04a4c 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Та мөн энэ ПИН-г нөгөө төхөөрөмжүүд дээр оруулах хэрэгтэй болж магадгүй."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Та мөн энэ түлхүүрийг нөгөө төхөөрөмж дээр оруулах хэрэгтэй болж магадгүй."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Дараахтай хослуулах:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Дараах түлхүүрийг харуулж байгаа эсэхийг анхаарна уу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Зохицсон багцтай хослуулахыг баталгаажуулна уу"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Юунаас:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Энэ төхөөрөмжтэй хослуулах уу?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>-тай хослуулахын тулд дээр нь <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>-г оруулаанд Буцах буюу Оруулах товчийг дарна уу."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Харилцагч болон дуудлагын түүхийн хандалтыг зөвшөөрөх"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Холбогдож чадсангүй. Дахин оролдоно уу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Төхөөрөмжийн дэлгэрэнгүй"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Төхөөрөмжийн Bluetooth хаяг: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Төхөөрөмжийн Bluetooth хаяг:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Төхөөрөмжийг мартах уу?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Холбогдох байдлыг хасах"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Аппыг салгах уу?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Тохиргоог сануулах"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоо"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Холбогдсон Bluetooth аудио төхөөрөмжийн дээд тоог сонгох"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC стекийн дебаг хийх лог"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC стекийн логийн түвшнийг нэмэгдүүлэх"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Дамжуулах"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"тусгал"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Утасгүй дэлгэцийг идэвхжүүлэх"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 6b21917..f0e2d93 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -272,7 +272,7 @@
     <item msgid="5099026183238335900">"स्थानाचे परीक्षण करा"</item>
     <item msgid="2297727967385895059">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
     <item msgid="8700593962030471569">"वापरविषयक आकडेवारी मिळवा"</item>
-    <item msgid="4140820386622184831">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
+    <item msgid="4140820386622184831">"मायक्रोफोन म्यूट/अनम्यूट करा"</item>
     <item msgid="317746827951691657">"टोस्ट दर्शवा"</item>
     <item msgid="5679422988212309779">"प्रोजेक्‍ट मीडिया"</item>
     <item msgid="6454031639780101439">"VPN सक्रिय करा"</item>
@@ -339,7 +339,7 @@
     <item msgid="8482874682804856549">"स्थान"</item>
     <item msgid="5186169827582545242">"स्थान"</item>
     <item msgid="6122293931012635638">"वापरविषयक आकडेवारी मिळवा"</item>
-    <item msgid="2526677383312751932">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
+    <item msgid="2526677383312751932">"मायक्रोफोन म्यूट/अनम्यूट करा"</item>
     <item msgid="4000577305179914546">"टोस्ट दर्शवा"</item>
     <item msgid="8660207174515570558">"प्रोजेक्‍ट मीडिया"</item>
     <item msgid="3904996949561946108">"VPN सक्रिय करा"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3b9f320..e7597ec 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -31,7 +31,7 @@
     <string name="show_dev_already" msgid="7041756429707644630">"आवश्यकता नाही, तुम्ही आधीपासून एक डेव्हलपर आहात."</string>
     <string name="dev_settings_disabled_warning" msgid="6971867026249671244">"कृपया सर्वात आधी डेव्हलपर पर्याय सुरू करा."</string>
     <string name="header_category_wireless_networks" msgid="303445626075235229">"वायरलेस आणि नेटवर्क"</string>
-    <string name="header_category_system" msgid="1665516346845259058">"सिस्टम"</string>
+    <string name="header_category_system" msgid="1665516346845259058">"सिस्टीम"</string>
     <string name="radioInfo_service_in" msgid="9088637745836646271">"सेवेत"</string>
     <string name="radioInfo_service_out" msgid="1868347333892403287">"सेवाबाह्य"</string>
     <string name="radioInfo_service_emergency" msgid="6838935881091760942">"फक्त आणीबाणीचे कॉल"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"तुम्हाला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"तुम्हाला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"यासह जोडण्यासाठी:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे ही पासकी दर्शवत असल्याचे सुनिश्चित करा:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"समन्वित सेटशी पेअर करण्याचे कंफर्म करा"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे डिव्हाइस जोडायचे?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"यासह जोडण्यासाठी:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>यावर टाइप करा:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, नंतर Return किंवा Enter दाबा."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"तुमच्या संपर्क आणि कॉल इतिहासातील अ‍ॅक्सेसची अनुमती द्या"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"कनेक्ट होऊ शकत नाही. पुन्हा प्रयत्न करा."</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिव्हाइस तपशील"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिव्हाइसचा ब्लूटूथ अ‍ॅड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिव्हाइसचा ब्लूटूथ अ‍ॅड्रेस:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिव्हाइस विसरायचे का?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"सहयोग काढा"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"अ‍ॅप डिस्कनेक्‍ट करायचे आहे का?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"जास्तीत जास्त कनेक्ट होऊ शकणारी ऑडिओ डिव्हाइस"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"जास्तीत जास्त कनेक्ट होऊ शकणार्‍या ऑडिओ डिव्हाइसची संख्या निवडा"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC स्टॅक डीबग लॉग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC स्टॅक लॉग करण्याची पातळी वाढवा"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"कास्‍ट करा"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"मिरर करा"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस डिस्प्ले सुरू करा"</string>
@@ -1823,7 +1827,7 @@
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"तुमच्या मोबाइल डेटा कनेक्शन किंवा वाय-फाय द्वारे इतर डिव्हाइसना इंटरनेट पुरवण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससह आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉटदेखील तयार करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मदत"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"मोबाइल नेटवर्क"</string>
-    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"मोबाइल योजना"</string>
+    <string name="manage_mobile_plan_title" msgid="5616930513733409064">"मोबाइल प्लॅन"</string>
     <string name="sms_application_title" msgid="4791107002724108809">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"SMS अ‍ॅप बदलायचा?"</string>
     <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> ला तुमचा SMS अ‍ॅप म्हणून वापराय?"</string>
@@ -3012,7 +3016,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Google सर्व्हरवरील आपल्या वाय-फाय पासवर्ड, बुकमार्क, इतर सेटिंग्ज आणि अ‍ॅप डेटाचा बॅक अप घेणे थांबवायचे तसेच सर्व प्रती मिटवायच्या?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि (अ‍ॅप्सद्वारे स्टोअर केलेल्या सेटिंग्ज आणि फाइल यासारख्या) अ‍ॅप डेटाचा बॅकअप घेणे थांबवायचे, तसेच दूरस्थ सर्व्हर वरील सर्व प्रती मिटवायच्या?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"आपोआप डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फाइल) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप सुरू करता तेव्‍हा, डिव्हाइस आणि अ‍ॅप डेटा ठराविक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, मेसेज आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"आपोआप डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फाइल) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप सुरू करता तेव्‍हा, डिव्हाइस आणि अ‍ॅप डेटा ठरावीक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, मेसेज आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"डिव्हाइस प्रशासक सेटिंग्ज"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"डिव्हाइस अ‍ॅडमिन अ‍ॅप"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"हे डिव्हाइस अ‍ॅडमिन अ‍ॅप निष्क्रिय करा"</string>
@@ -3074,7 +3078,7 @@
     <string name="sync_one_time_sync" msgid="8114337154112057462">"आता संकालित करण्यासाठी टॅप करा<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
-    <string name="sync_calendar" msgid="4603704438090387251">"Calendar"</string>
+    <string name="sync_calendar" msgid="4603704438090387251">"कॅलेंडर"</string>
     <string name="sync_contacts" msgid="2376465611511325472">"संपर्क"</string>
     <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Google सिंकामध्ये स्वागत आहे!"</font>" \nतुम्ही जेथे आहात तेथून आपल्या संपर्क, भेटी आणि अधिक मध्ये प्रवेश करण्याची अनुमती देण्यासाठी डेटा सिंक करण्याकरिता एक Google दृष्टिकोन."</string>
     <string name="header_application_sync_settings" msgid="7427706834875419243">"अ‍ॅप सिंक सेटिंग्ज"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index bedb34e..596208f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Anda juga mungkin perlu menaipkan PIN ini pada peranti satu lagi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Anda juga mungkin perlu memasukkan kunci laluan ini pada peranti satu lagi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Untuk menjadi pasangan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pastikan ia menunjukkan kunci laluan ini:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Sahkan untuk bergandingan dengan set yang diselaraskan"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Dari:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Jadikan pasangan peranti ini?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Untuk berpasangan dengan:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Taip padanya:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kemudian tekan Kembali atau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Benarkan akses kepada kenalan dan sejarah panggilan anda"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Tidak dapat bersambung. Cuba lagi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Butiran peranti"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Alamat Bluetooth peranti: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Alamat Bluetooth peranti:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Lupakan peranti?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Keluarkan kaitan"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Putuskan Sambungan Apl?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ingat tetapan"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Pilih bilangan maksimum peranti audio Bluetooth yang disambungkan"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log nyahpepijat tindanan NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tingkatkan tahap pengelogan tindanan NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Hantar"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"cermin"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Dayakan paparan wayarles"</string>
@@ -1833,7 +1837,7 @@
     <string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> bukannya <xliff:g id="CURRENT_APP">%2$s</xliff:g> untuk mengurus sambungan rangkaian anda?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> untuk mengurus sambungan rangkaian anda?"</string>
     <string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"Pengendali SIM yang tidak diketahui"</string>
-    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> tiada tapak web peruntukan yang dikenali"</string>
+    <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> tiada laman web peruntukan yang dikenali"</string>
     <string name="mobile_insert_sim_card" msgid="3639245241283948038">"Sila masukkan kad SIM dan mulakan semula"</string>
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"Sila sambung ke internet"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Permintaan lokasi terbaharu"</string>
@@ -2667,11 +2671,11 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Sesetengah ciri mungkin terhad"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Penggunaan bateri tertinggi"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Lihat apl dengan penggunaan tertinggi"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengecasan terhad buat sementara waktu"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengecasan terhad sementara"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Untuk menjimatkan bateri anda. Ketahui lebih lanjut."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Sambung semula pengecasan"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, telefon anda akan dicas secara automatik seperti biasa."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, tablet anda akan dicas secara automatik seperti biasa."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu anda mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, telefon anda akan dicas secara automatik seperti biasa."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu anda mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, tablet anda akan dicas secara automatik seperti biasa."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Oleh sebab anda telah menggunakan telefon anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Oleh sebab anda telah menggunakan tablet anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Oleh sebab anda telah menggunakan peranti anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
@@ -2972,7 +2976,7 @@
     <string name="user_certificate" msgid="6897024598058566466">"Sijil pengguna VPN &amp; apl"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Sijil Wi‑Fi"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Data anda tidak akan kekal rahsia"</string>
-    <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Sijil CA digunakan oleh tapak web, apl dan VPN untuk penyulitan. Hanya pasang sijil CA daripada organisasi yang anda percayai. \n\nJika anda memasang sijil CA, pemilik sijil dapat mengakses data anda, seperti kata laluan atau butiran kad kredit, dari laman web yang anda lawati atau apl yang anda gunakan – meskipun data anda disulitkan."</string>
+    <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Sijil CA digunakan oleh laman web, apl dan VPN untuk penyulitan. Hanya pasang sijil CA daripada organisasi yang anda percayai. \n\nJika anda memasang sijil CA, pemilik sijil dapat mengakses data anda, seperti kata laluan atau butiran kad kredit, dari laman web yang anda lawati atau apl yang anda gunakan – meskipun data anda disulitkan."</string>
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Jangan pasang"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Pasang juga"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sijil tidak dipasang"</string>
@@ -3292,14 +3296,14 @@
       <item quantity="one">Percayai atau alih keluar sijil</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> telah memasang sijil kuasa pada peranti anda yang mungkin membenarkan pemantauan aktiviti rangkaian peranti anda, termasuk e-mel, apl dan tapak web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang sijil kuasa pada peranti anda yang mungkin membenarkan pemantauan aktiviti rangkaian peranti anda, termasuk e-mel, apl dan tapak web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> telah memasang sijil kuasa pada peranti anda yang mungkin membenarkan pemantauan aktiviti rangkaian peranti anda, termasuk e-mel, apl dan laman web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang sijil kuasa pada peranti anda yang mungkin membenarkan pemantauan aktiviti rangkaian peranti anda, termasuk e-mel, apl dan laman web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan tapak web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan tapak web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan laman web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> telah memasang sijil kuasa untuk profil kerja anda yang mungkin membenarkan pemantauan aktiviti rangkaian kerja, termasuk e-mel, apl dan laman web selamat.\n\nHubungi pentadbir anda untuk mengetahui lebih lanjut tentang sijil ini.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Pihak ketiga berkeupayaan untuk memantau aktiviti rangkaian anda, termasuk e-mel, apl dan tapak web selamat.\n\nBukti kelayakan dipercayai yang dipasang pada peranti anda yang membolehkan perkara ini."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Pihak ketiga berkeupayaan untuk memantau aktiviti rangkaian anda, termasuk e-mel, apl dan laman web selamat.\n\nBukti kelayakan dipercayai yang dipasang pada peranti anda yang membolehkan perkara ini."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="other">Semak sijil</item>
       <item quantity="one">Semak sijil</item>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 93a8fc3..5f8baa1 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -217,7 +217,7 @@
   </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="3771157789865587832">"စက်တွင်းသိုလှောင်ကိရိယာ"</item>
-    <item msgid="5501345333507193420">"ဖယ်ရှား၍ရသောSDကတ်"</item>
+    <item msgid="5501345333507193420">"ဖယ်ရှား၍ရသော SD ကတ်"</item>
     <item msgid="2362840341195111674">"စနစ်အား ဆုံးဖြတ်ပါစေ"</item>
   </string-array>
   <string-array name="app_ops_categories">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3d48d63..717c8f6 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="1999566976857398962">"Yes"</string>
     <string name="no" msgid="5541738710521607130">"No"</string>
-    <string name="create" msgid="986997212165228751">"ဖန်တီးရန်"</string>
+    <string name="create" msgid="986997212165228751">"ပြုလုပ်ရန်"</string>
     <string name="allow" msgid="3763244945363657722">"ခွင့်ပြုရန်"</string>
     <string name="deny" msgid="7326117222944479942">"ငြင်းပယ်ရန်"</string>
     <string name="confirmation_turn_on" msgid="2979094011928347665">"ဖွင့်ရန်"</string>
@@ -44,7 +44,7 @@
     <string name="radioInfo_data_suspended" msgid="2001254415431299603">"ဆိုင်းငံ့ထားသည်"</string>
     <string name="radioInfo_unknown" msgid="2892562356748600367">"မသိ"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"USBကိရိယာထိုင်ခြင်းဖြုတ်"</string>
-    <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
+    <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"SD ကတ်ကို စနစ်မှဖြုတ်ခြင်း"</string>
     <string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
     <string name="sdcard_format" product="default" msgid="3676635435136326182">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="preview_pager_content_description" msgid="3762247188224576303">"အစမ်းကြည့်ပါ"</string>
@@ -134,7 +134,7 @@
     <string name="bluetooth_map_request" msgid="8664081227240707479">"စာသုံးခွင့်ပြုရန်တောင်းခံချက်"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"SIM ကတ် သုံးခွင့် တောင်းဆိုမှု"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကဒ်အား ဝင်ရောက်သုံးလို၏။ SIM ကဒ်အား ဝင်ရောက်သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်ရောက်သုံးခွင့်ပြုရန်"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကတ်အား အသုံးပြုလို၏။ SIM ကတ်အား သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်သုံးခွင့်ပြုရန်"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"အခြားစက်ပစ္စည်းများက “<xliff:g id="DEVICE_NAME">^1</xliff:g>” အဖြစ် မြင်ရပါမည်"</string>
     <string name="bluetooth_off_footer" msgid="76578735660216295">"အခြားစက်များသို့ ချိတ်ဆက်ရန် \'ဘလူးတုသ်\' ကို ဖွင့်ပါ။"</string>
     <string name="bluetooth_paired_device_title" msgid="3240639218362342026">"သင်၏ စက်ပစ္စည်းများ"</string>
@@ -190,19 +190,19 @@
     <string name="sdcard_settings_screen_mass_storage_text" msgid="129059989000252994">"USB ဖြင့်အချက်အလက်မြောက်များစွာ သိမ်းဆည်းနိုင်သော နေရာကို ရနိုင်ခြင်း"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="5298511430610207103">"စုစုပေါင်း bytes"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"USB သိုလှောင်ကိရိယာ မတပ်ရသေးပါ"</string>
-    <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"SD ကဒ်မရှိပါ"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"SD ကတ်မရှိပါ"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="7721283102767669004">"ရရှိနိုင်သောbyteများ:"</string>
     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"USB သိုလှောင်ကိရိယာကို စုပေါင်းသိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD ကဒ်ကို သိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD ကတ်ကို သိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"ယခု SDကဒ်ဖြုတ်ရန် စိတ်ချရပါပြီ"</string>
-    <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"ယခု SDကဒ်ဆွဲဖြုတ်ရန် စိတ်ချရပါပြီ။"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"ယခု SD ကတ်ဖြုတ်ရန် စိတ်ချရပါပြီ။"</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="209564009449909311">"USBသိုလှောင်မှုသုံးနေစဉ်ဖယ်သည်"</string>
-    <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"SD ကဒ်အား အသုံးပြုနေဆဲတွင် ဖယ်ရှားခဲ့ပါသည်"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"SD ကတ်အား အသုံးပြုနေစဉ် ဖယ်ရှားခဲ့ပါသည်"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="5646588579332741943">"အသုံးပြုသောbytes"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="8037280964384235345">"မီဒီယာအတွက် USBသိုလှောင်ကိရိယာကို စကင်ပြုလုပ်နေသည်"</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="3297316465982471437">"မီဒီယာအတွက် SDကဒ်ကို စကင်ပြုလုပ်နေသည်"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="3297316465982471437">"SD ကတ်ကို မီဒီယာအတွက် စကင်ဖတ်နေသည်..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3444648373391629840">"USB ကိုဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး"</string>
-    <string name="sdcard_settings_read_only_status" product="default" msgid="4338796260718910164">"SDကဒ်ကို ဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး။"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="4338796260718910164">"SD ကတ်ကို ဖတ်ရန်အတွက်သာ တပ်ထားသည်။"</string>
     <string name="skip_label" msgid="6380034601349015895">"ကျော်ရန်"</string>
     <string name="next_label" msgid="1248293387735652187">"ရှေ့သို့"</string>
     <string name="language_picker_title" msgid="4271307478263345133">"ဘာသာစကားများ"</string>
@@ -315,7 +315,7 @@
     <string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"စက်ပစ္စည်းကို အသွင်ဝှက်မထားပါ"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"လော့ခ်မျက်နှာပြင်"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ပြသမည့်အရာ"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုလော့ခ်ဖွင့်ခြင်း ဆင်းမ်ကတ်လော့ခ်ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"ကန့်သတ်ရန် ဆက်တင်"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"မရနိုင်ပါ"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ဤပင်နံပါတ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ဤ ဖြတ်သန်းခွင့်ကုဒ်ကို အခြား စက်ပစ္စည်းတွင်လည်း ရိုက်ထည့်ရန် လိုအပ်နိုင်သည်။"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;များနှင့်တွဲချိတ်စေရန် &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;ဖြတ်သန်းခွင့်ကီးပြသစေရန် သေချာပါစေ"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ချိတ်ဆက်ထားသည့်အစီအစဉ်အတိုင်း တွဲချိတ်ရန်အတည်ပြုပါ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">":&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;မှ ဤစက်နှင့်တွဲချိတ်မည်လား"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">":<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>နှင့်ချိတ်တွဲရန်:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>ကိုရိုက်ထည့်ကာ, Return သို့မဟုတ် Enterကိုနှိပ်ပါ"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"သင်၏ အဆက်အသွယ်များနှင့် ယခင်ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ခွင့်ပြုပါ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ချိတ်ဆက်မရပါ။ ထပ်လုပ်ကြည့်ပါ။"</string>
     <string name="device_details_title" msgid="1155622417516195481">"စက်အသေးစိတ်များ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"စက်၏ ဘလူးတုသ်လိပ်စာ-\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"စက်ပစ္စည်းကို ပယ်ဖျက်လိုပါသလား။"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"အဖွဲ့ကို ဖယ်ရှားရန်"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"အက်ပ် ချိတ်ဆက်မှုဖြုတ်မလား။"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ဘလူးတုသ်က အများဆုံးချိတ်ဆက်ထားနိုင်သည့် စက်အရေအတွက်"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ချိတ်ဆက်ထားနိုင်သည့် ဘလူးတုသ် ချိတ်ဆက်နိုင်သည့် အများဆုံးအရေအတွက်ကို ရွေးပါ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ဖွဲ့စည်းပုံ အမှားရှာပြင်မှတ်တမ်း"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ဖွဲ့စည်းပုံ မှတ်တမ်း အဆင့်ကို တိုးရန်"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ကာစ်"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"စကရင်ပွားရန်"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ကြိုးမဲ့ ပြသမှုကို ဖွင့်ရန်"</string>
@@ -1441,7 +1445,7 @@
     <string name="sim_lock_settings_category" msgid="4280307997492851625">"ဆင်းမ်ကတ် လော့ခ်"</string>
     <string name="sim_lock_settings_summary_off" msgid="4570941250786847095">"ပိတ်"</string>
     <string name="sim_lock_settings_summary_on" msgid="1562184566830887925">"လော့ခ်ချထားသည်"</string>
-    <string name="sim_lock_settings_title" msgid="1401619059761012696">"ဆင်းကဒ် သော့ချခြင်း"</string>
+    <string name="sim_lock_settings_title" msgid="1401619059761012696">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
     <string name="sim_pin_toggle" msgid="98754920202404425">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
     <string name="sim_lock_on" product="tablet" msgid="5857965768682972363">"တက်ဘလက်ကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
     <string name="sim_lock_on" product="default" msgid="3303147192981388923">"ဖုန်းကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
@@ -1450,7 +1454,7 @@
     <string name="sim_pin_change" msgid="5978881209990507379">"ဆင်းမ်ကတ် ပင်နံပါတ်ပြောင်းရန်"</string>
     <string name="sim_enter_pin" msgid="8235202785516053253">"ဆင်းကဒ် ပင်နံပါတ်"</string>
     <string name="sim_enable_sim_lock" msgid="8993991669975548653">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
-    <string name="sim_disable_sim_lock" msgid="7656447857474746157">"ဆင်းမ်ကဒ်ကို သော့ဖွင့်ရန်"</string>
+    <string name="sim_disable_sim_lock" msgid="7656447857474746157">"ဆင်းမ်ကတ်ကို လော့ခ်ဖွင့်ရန်"</string>
     <string name="sim_enter_old" msgid="6882545610939674813">"ဆင်းကဒ် ပင်နံပါတ်အဟောင်း"</string>
     <string name="sim_enter_new" msgid="9010947802784561582">"ဆင်းကဒ် ပင်နံပါတ် အသစ်"</string>
     <string name="sim_reenter_new" msgid="6131418271490374263">"PIN အသစ်ကို ပြန်ပြီး တိုက်ရိုက်ပါ"</string>
@@ -1459,7 +1463,7 @@
     <string name="sim_pins_dont_match" msgid="1540348773896609260">"ပင်နံပါတ်များ မတူပါ။"</string>
     <string name="sim_change_failed" msgid="316723087029061740">"ပင်နံပါတ်ပြောင်း၍မရပါ\nပင်နံပါတ်အမှား ဖြစ်နိုင်သည်"</string>
     <string name="sim_change_succeeded" msgid="3516905528149069739">"ဆင်းကဒ် ပင်နံပါတ် ပြောင်းခြင်းအောင်မြင်ပါသည်"</string>
-    <string name="sim_lock_failed" msgid="16360418201678317">"ဆင်းမ်ကဒ်သော့ကျနေမှုအခြေအနေအား ပြောင်းမရပါ။ \nပင်နံပါတ်မှားယွင်းမှု ဖြစ်နိုင်သည်။"</string>
+    <string name="sim_lock_failed" msgid="16360418201678317">"ဆင်းမ် လော့ခ်ကျနေသည်။ \nပင် မှားနေသည်။"</string>
     <string name="sim_pin_disable_failed" msgid="8719890393181032837">"ပင်နံပါတ်ကို ပိတ်၍မရပါ။"</string>
     <string name="sim_pin_enable_failed" msgid="5156513975085380284">"ပင်နံပါတ်ကို ဖွင့်၍မရပါ။"</string>
     <string name="sim_enter_ok" msgid="3401715290135787531">"OK"</string>
@@ -1469,7 +1473,7 @@
     <string name="sim_change_data_title" msgid="4663239438584588847">"မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER">%1$s</xliff:g> သုံးမလား။"</string>
     <string name="sim_change_data_message" msgid="3046178883369645132">"မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER2_0">%2$s</xliff:g> အသုံးပြုနေသည်။ <xliff:g id="CARRIER1">%1$s</xliff:g> သို့ပြောင်းလျှင် မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER2_1">%2$s</xliff:g> ကို အသုံးပြုတော့မည် မဟုတ်ပါ။"</string>
     <string name="sim_change_data_ok" msgid="4922114750417276560">"<xliff:g id="CARRIER">%1$s</xliff:g> သုံးရန်"</string>
-    <string name="sim_preferred_title" msgid="7182406911552216373">"SIM ကဒ်ကို အပ်ဒိတ်လုပ်မလား"</string>
+    <string name="sim_preferred_title" msgid="7182406911552216373">"SIM ကတ်ကို အပ်ဒိတ်လုပ်မလား"</string>
     <string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> သည် သင့်ဖုန်းထဲရှိ တစ်ခုတည်းသော ဆင်းမ်ကဒ်ဖြစ်သည်။ ဤဆင်းမ်ကဒ်ကို မိုဘိုင်းဒေတာ အသုံးပြုရန်၊ ဖုန်းခေါ်ရန်နှင့် SMS မက်ဆေ့ဂျ်ပို့ရန် အတွက် အသုံးပြုလိုပါသလား။"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"ဆင်းမ်ကတ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန် ဖုန်းလိုင်းဌာနသို့ ဆက်သွယ်ရမည် ဖြစ်ပါတယ်"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
@@ -1500,7 +1504,7 @@
     <string name="storage_usb_settings" msgid="7058142934214211583">"သိုလှောင်ခန်း"</string>
     <string name="storage_settings_title" msgid="486118156723194815">"သိုလှောင်မှု ဆက်တင်များ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"USBသိုလှောင်မှုကိရိယာအား အထိုင်မှဖြုတ်မည် သိုလှောင်နိုင်မှုအားကြည့်မည်"</string>
-    <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SDကဒ်ကို အထိုင်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
+    <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SD ကတ်ကို စနစ်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (ဆင်းမ် အထိုင် %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"ကြည့်ရန် သိမ်းထားသည့် ကွန်ရက်ကို ရွေးပါ"</string>
     <string name="status_number" product="tablet" msgid="3597945414666253183">"MDNနံပါတ်"</string>
@@ -1551,30 +1555,30 @@
     <string name="memory_media_misc_usage" msgid="7066851245178533269">"အခြားဖိုင်များ"</string>
     <string name="memory_media_cache_usage" msgid="780808666853685824">"မှတ်သိမ်းထားသော ဒေတာ"</string>
     <string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"မျှဝေသုံးသောသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
-    <string name="sd_eject" product="default" msgid="8062832622096296251">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
+    <string name="sd_eject" product="default" msgid="8062832622096296251">"SD ကတ်အား စနစ်မှဖြုတ်ခြင်း"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"စက်အတွင်းUSBသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
-    <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"SDကဒ်ကိုအထိုင်မှဖြုတ်ယူခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနုိင်မည်"</string>
+    <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"SD ကတ်ကို စနစ်မှဖြုတ်ခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနိုင်မည်"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"အထိုင်အတွက်USBထည့်ပါ"</string>
-    <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"အထိုင်တွင်စိုက်ရန်အတွက် SDကဒ်ကို တပ်မည်"</string>
+    <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"စနစ်တွင် SD ကတ်ကို တပ်မည်"</string>
     <string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"USBသိုလှောင်မှုကိုထိုင်ပါ"</string>
-    <string name="sd_mount" product="default" msgid="5279813999455776169">"SD ကဒ်ကိုအထိုင်တွင်စိုက်မည်"</string>
+    <string name="sd_mount" product="default" msgid="5279813999455776169">"SD ကတ်ကို စနစ်တွင်တပ်မည်"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="2190410240845521205"></string>
     <string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
     <string name="sd_format" product="nosdcard" msgid="8657427883364711513">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
     <string name="sd_format" product="default" msgid="9085302892248732329">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
-    <string name="sd_format_summary" product="default" msgid="60583152211068164">"SDကဒ်ထဲရှိ သီးချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+    <string name="sd_format_summary" product="default" msgid="60583152211068164">"SD ကတ်ထဲရှိ သီးချင်း သို့မဟုတ် ဓာတ်ပုံကဲ့သို့ ဒေတာအားလုံးကို ဖျက်ရန်"</string>
     <string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"MTP သို့ PTP လုပ်ငန်း အသက်ဝင်နေသည်။"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"USBသိမ်းဆည်းမှုဖြုတ်မလား"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"SDကဒ်အားအထိုင်မှဖြုတ်မည်လား?"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"SD ကတ်ကို စနစ်မှဖြုတ်မလား။"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"သင် ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှုကို အထိုင်မှဖြုတ်လိုက်ပါက တချို့ အက်ပ်များ က ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှု ပြန်ပိတ်သည်အထိ အလုပ်မလုပ် သို့ သုံးစွဲရန် ရှိနေမည် မဟုတ်ပါ"</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"SDကဒ်ကို အထိုင်မှဖြုတ်လျှင် သင်အသုံးပြုနေသောတချို့အပ်ပလီကေးရှင်းများမှာ ရပ်ကာ ပြန်လည်အထိုင်တွင်မတပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"SD ကတ်ကို စနစ်မှဖြုတ်လျှင် သင်အသုံးပြုနေသော အချို့အပလီကေးရှင်းများ ရပ်သွားနိုင်ပြီး စနစ်တွင် ပြန်လည်တပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USBသိုလှောင်မှုကိရိယာအားအထိုင်မှ ဖြုတ်၍မရပါ။ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SDကဒ်အားအထိုင်မှ ဖြုတ်၍မရပါ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD ကတ်ကို စနစ်မှ ဖြုတ်၍မရပါ ထပ်ကြိုးစားကြည့်ပါ"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USBသိုလှောင်ကိရိယာအား အထိုင်မှဖြုတ်မည်"</string>
-    <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SDကဒ်အား အထိုင်မှဖြုတ်မည်"</string>
+    <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD ကတ်ကို စနစ်မှဖြုတ်မည်"</string>
     <string name="sd_ejecting_title" msgid="1641122369013595273">"အထိုင်မှဖြုတ်နေပါသည်"</string>
     <string name="sd_ejecting_summary" msgid="861928572729341132">"အထိုင်မှဖြုတ်နေပါသည်"</string>
     <string name="storage_low_title" msgid="8002650511493419567">"သိမ်းဆည်းရန်နေရာနည်းနေသည်။"</string>
@@ -1757,11 +1761,11 @@
     <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM များ"</li></string>
     <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
     <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏အခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USB သိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
-    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"သီချင်း၊ ပုံများနှင့် အခြားာအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SD ကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"သီချင်း၊ ပုံများနှင့် အခြားာအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SD ကတ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
-    <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDကတ်အား ဖျက်ရန်"</string>
+    <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ကတ်အား ဖျက်ရန်"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
-    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+    <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD ကတ်ထဲရှိ သီချင်း သို့မဟုတ် ဓာတ်ပုံကဲ့သို့ ဒေတာအားလုံးကို ဖျက်ရန်"</string>
     <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
     <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
     <string name="main_clear_final_desc" msgid="5800877928569039580">"သင့်ကိုယ်ရေးကိုယ်တာအချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
@@ -1834,7 +1838,7 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"သင်၏ ကွန်ရက် ချိတ်ဆက်မှုများကို စီမံကွပ်ကဲရန် <xliff:g id="NEW_APP">%s</xliff:g>ကို သုံးရမလား?{"</string>
     <string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"မသိရ ဆင်းမ် အော်ပရေတာ"</string>
     <string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> တွင် မည်သည့်ဝဘ်ဆိုက်မျှ​ ပေးထားခြင်းမရှိပါ"</string>
-    <string name="mobile_insert_sim_card" msgid="3639245241283948038">"ကျေးဇူးပြု၍ ဆင်းမ်ကဒ်ထည့်၍ အစမှ ပြန်စပါ။"</string>
+    <string name="mobile_insert_sim_card" msgid="3639245241283948038">"ကျေးဇူးပြု၍ ဆင်းမ်ကတ်ထည့်၍ အစမှ ပြန်စပါ။"</string>
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"ကျေးဇူးပြု၍ အင်တာနက်ဖြင့် ချိတ်ဆက်ပါ။"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
     <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"အားလုံး ကြည့်ရန်"</string>
@@ -2086,7 +2090,7 @@
     <string name="filter_apps_third_party" msgid="9049447784849114843">"ဒေါင်းလုပ်ပြုလုပ်ပြီး"</string>
     <string name="filter_apps_running" msgid="535465683273284141">"အလုပ်လုပ်နေသည်"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="5140211657134608469">"USBသိုလှောင်ကိရိယာ"</string>
-    <string name="filter_apps_onsdcard" product="default" msgid="1774499644768369891">"SD ကဒ်ပေါ်တွင်"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1774499644768369891">"SD ကတ်ပေါ်တွင်"</string>
     <string name="not_installed" msgid="5074606858798519449">"ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ"</string>
     <string name="installed" msgid="2837449358488825884">"ထည့်သွင်းထားသည်"</string>
     <string name="no_applications" msgid="985069304755391640">"အက်ပ် မရှိပါ။"</string>
@@ -2108,7 +2112,7 @@
     <string name="move_app_to_internal" product="tablet" msgid="5799782476959541144">"တက်ဘလက်သို့ရွေ့မည်"</string>
     <string name="move_app_to_internal" product="default" msgid="7395498801589544372">"ဖုန်းသို့ရွေ့မည်"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="1145367822171576972">"USBသိုလှောင်မှုသို့ရွေ့ပါ"</string>
-    <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"SDကဒ်သို့ရွေ့မည်"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"SD ကတ်သို့ရွှေ့မည်"</string>
     <string name="another_migration_already_in_progress" msgid="6550546307856052261">"အခြားရွှေ့ပြောင်းမှု တစ်ခုလုပ်ဆောင်နေပါသည်။"</string>
     <string name="insufficient_storage" msgid="8115088042669030558">"သိမ်းဆည်းရန်နေရာအလုံအလောက်မရှိပါ"</string>
     <string name="does_not_exist" msgid="6499163879348776120">"အပလီကေးရှင်းမှာ မရှိပါ"</string>
@@ -2192,7 +2196,7 @@
     <string name="auto_punctuate_summary" msgid="3549190848611386748">"Space key အားနှစ်ခါနှိပ်ပါက  \".\" အား ထည့်မည်"</string>
     <string name="show_password" msgid="7101900779571040117">"စကားဝှက်များကို ပြရန်"</string>
     <string name="show_password_summary" msgid="9025960283785111619">"စာရိုက်သည့်အခါ အက္ခရာများကို ခဏတာပြပါ"</string>
-    <string name="spellchecker_security_warning" msgid="2016059050608271820">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>ဤစာလုံးပေါင်းစစ်ဆေးခြင်းကို အသုံးပြုမည်လား?"</string>
+    <string name="spellchecker_security_warning" msgid="2016059050608271820">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ခရက်ဒစ်ကတ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ ဤသည်မှာ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> အက်ပ်မှဖြစ်သည်။ ဤစာလုံးပေါင်းစစ်စနစ်ကို အသုံးပြုမလား။"</string>
     <string name="spellchecker_quick_settings" msgid="6449414356743946577">"ဆက်တင်များ"</string>
     <string name="spellchecker_language" msgid="8905487366580285282">"ဘာသာစကား"</string>
     <string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"လက်ကွက်များ"</string>
@@ -2322,14 +2326,14 @@
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"ဖွင့်ရန် သုံးချက်တို့ခြင်း"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"ဖွင့်ရန် လက်ဟန်ကို အသုံးပြုပါ"</string>
     <string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8485448068531147828">"အများသုံးစွဲနိုင်မှု လက်ဟန်အသစ်ကို အသုံးပြုရန်"</string>
-    <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"ဤဝန်ဆောင်မှု အသုံးပြုရန် သင့်ဖန်သားပြင် အောက်ခြေရှိ အများသုံးစွဲနိုင်မှု ခလုတ် <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> ကို တို့ပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် အများသုံးစွဲနိုင်မှုခလုတ်ကို ထိပြီး နှိပ်ထားပါ။"</string>
-    <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"ဤဝန်ဆောင်မှုကိုသုံးရန် သင့်ဖန်သားပြင်ပေါ်ရှိ အများသုံးစွဲနိုင်မှုခလုတ်ကို တို့ပါ။"</string>
+    <string name="accessibility_tutorial_dialog_message_button" msgid="7002398857479782303">"ဤဝန်ဆောင်မှု အသုံးပြုရန် သင့်ဖန်သားပြင် အောက်ခြေရှိ သုံးနိုင်မှုခလုတ် <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> ကို တို့ပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် သုံးနိုင်မှုခလုတ်ကို ဖိထားပါ။"</string>
+    <string name="accessibility_tutorial_dialog_message_floating_button" msgid="2551777208185138391">"ဤဝန်ဆောင်မှုကိုသုံးရန် သင့်ဖန်သားပြင်ပေါ်ရှိ သုံးနိုင်မှုခလုတ်ကို တို့ပါ။"</string>
     <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"ဤဝန်ဆောင်မှု အသုံးပြုရန် အသံခလုတ် နှစ်ခုလုံးကို နှိပ်ထားပါ။"</string>
     <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"ချဲ့ခြင်း စတင်ရန်၊ ရပ်ရန် သင့်ဖန်သားပြင်ပေါ် တစ်နေရာရာတွင် သုံးချက်တို့ပါ။"</string>
     <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"ဤဝန်ဆောင်မှု အသုံးပြုရန် လက် ၂ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၂ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
     <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"ဤဝန်ဆောင်မှု အသုံးပြုရန် လက် ၃ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၃ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုတစ်ခု အသုံးပြုရန် လက် ၂ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၂ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုတစ်ခု အသုံးပြုရန် လက် ၃ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၃ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"အများသုံးနိုင်သည့် ဝန်ဆောင်မှုတစ်ခု အသုံးပြုရန် လက် ၂ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၂ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"အများသုံးနိုင်သည့် ဝန်ဆောင်မှုတစ်ခု အသုံးပြုရန် လက် ၃ ချောင်းဖြင့် ဖန်သားပြင်အောက်ခြေမှ အပေါ်သို့ပွတ်ဆွဲပါ။\n\nဝန်ဆောင်မှုများအကြား ပြောင်းရန် လက် ၃ ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပြီး ဖိထားပါ။"</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"ရပါပြီ"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g> ဖြတ်လမ်းလင့်ခ်"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"အများသုံးစွဲနိုင်မှု ခလုတ်"</string>
@@ -2361,8 +2365,8 @@
     <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"အများသုံးစွဲနိုင်မှု ခလုတ်နှင့် လက်ဟန်"</string>
     <string name="accessibility_button_intro" msgid="2601976470525277903">"အများသုံးစွဲနိုင်မှု ခလုတ်ကို သုံးနေသည်။ ခလုတ် ၃ ခုဖြင့် လမ်းညွှန်ခြင်းဖြင့် ဤလက်ဟန်ကို မရနိုင်ပါ။"</string>
     <string name="accessibility_button_summary" msgid="8510939012631455831">"အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုများကို အမြန်သုံးသည်"</string>
-    <string name="accessibility_button_gesture_description" msgid="2516420653060025670">"အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုများကို မည်သည့်ဖန်သားပြင်မှမဆို အမြန်သုံးနိုင်သည်။\n\nစတင်ရန် အများသုံးစွဲနိုင်မှု ဆက်တင်များသို့သွား၍ ဝန်ဆောင်မှုကို ရွေးပါ။ ဖြတ်လမ်းလင့်ခ်ကို တို့ပြီး အများသုံးစွဲနိုင်မှု ခလုတ်ကို ရွေးပါ။\n\nအများသုံးစွဲနိုင်မှု ခလုတ်ကို လမ်းညွှန်ဘားတွင် အစားထိုးသုံးရန် ခလုတ် ၂ ခု ဖြင့် လမ်းညွှန်ခြင်း (သို့) ခလုတ် ၃ ခုဖြင့် လမ်းညွှန်ခြင်းသို့ ပြောင်းပါ။"</string>
-    <string name="accessibility_button_description" msgid="7372405202698400339">"အများသုံးစွဲနိုင်မှုဆိုင်ရာ ဝန်ဆောင်မှုများကို မည်သည့်ဖန်သားပြင်မှမဆို အမြန်သုံးနိုင်သည်။ \n\nစတင်ရန် အများသုံးစွဲနိုင်မှု ဆက်တင်များသို့သွား၍ ဝန်ဆောင်မှုကို ရွေးပါ။ ဖြတ်လမ်းလင့်ခ်ကို တို့ပြီး အများသုံးစွဲနိုင်မှု ခလုတ်ကို ရွေးပါ။"</string>
+    <string name="accessibility_button_gesture_description" msgid="2516420653060025670">"အများသုံးနိုင်သည့် ဝန်ဆောင်မှုများကို မည်သည့်ဖန်သားပြင်မှမဆို အမြန်သုံးနိုင်သည်။\n\nစတင်ရန် သုံးနိုင်မှုဆက်တင်များသို့သွား၍ ဝန်ဆောင်မှုကို ရွေးပါ။ ဖြတ်လမ်းလင့်ခ်ကို တို့ပြီး သုံးနိုင်မှုခလုတ်ကို ရွေးပါ။\n\nသုံးနိုင်မှုခလုတ်ကို လမ်းညွှန်ဘားတွင် အစားထိုးသုံးရန် ခလုတ် ၂ ခု ဖြင့် လမ်းညွှန်ခြင်း (သို့) ခလုတ် ၃ ခုဖြင့် လမ်းညွှန်ခြင်းသို့ ပြောင်းပါ။"</string>
+    <string name="accessibility_button_description" msgid="7372405202698400339">"အများသုံးနိုင်သည့် ဝန်ဆောင်မှုများကို မည်သည့်ဖန်သားပြင်မှမဆို အမြန်သုံးနိုင်သည်။ \n\nစတင်ရန် သုံးနိုင်မှုဆက်တင်များသို့သွား၍ ဝန်ဆောင်မှုကို ရွေးပါ။ ဖြတ်လမ်းလင့်ခ်ကို တို့ပြီး သုံးနိုင်မှုခလုတ်ကို ရွေးပါ။"</string>
     <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"ခလုတ် (သို့) လက်ဟန်ကို သုံးရန်"</string>
     <string name="accessibility_button_location_title" msgid="7182107846092304942">"တည်နေရာ"</string>
     <string name="accessibility_button_size_title" msgid="5785110470538960881">"အရွယ်အစား"</string>
@@ -2953,7 +2957,7 @@
     <string name="credentials_title" msgid="7535942196886123656">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"လက်မှတ်ထည့်သွင်းခြင်း"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းရန်"</string>
-    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SDကဒ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
+    <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD ကတ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"အထောက်အထားများကို ရှင်းလင်းခြင်း"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"အသိအမှတ်ပြုလက်မှတ်အားလုံးကို ဖယ်ရှားရန်"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"ယုံကြည်သော အထောက်အထားများ"</string>
@@ -3328,8 +3332,8 @@
     <string name="user_confirm_remove_title" msgid="3626559103278006002">"ဤအသုံးပြုသူကို ဖျက်မလား။"</string>
     <string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"ဒီပရိုဖိုင်ကို ဖယ်ရှားရမလား?"</string>
     <string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"အလုပ်ပရိုဖိုင် ဖယ်ရှားမလား။"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"ဤ တက်ဘလက်ပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို သင် နောက်ပြန်သွား၍ မရနိုင်ပါ။"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"ဤဖုန်းပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို သင် နောက်ပြန်သွား၍ မရနိုင်ပါ။"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="439222554798995592">"ဤ တက်ဘလက်ပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍မရပါ။"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="5991495192044543230">"ဤဖုန်းပေါ်မှ သင့်နေရာနှင့် အချက်အလက်များသည် ပျောက်သွားလိမ့်မည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍မရပါ။"</string>
     <string name="user_confirm_remove_message" msgid="362545924965977597">"အက်ပ်အားလုံးနှင့် ဒေတာကို ဖျက်ပါမည်။"</string>
     <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"သင် ရှေ့ဆက်သွားပါက ဤပရိုဖိုင်ရှိ အက်ပ်များနှင့် ဒေတာ အားလုံးကို ဖျက်ပစ်မည်။"</string>
     <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"အက်ပ်အားလုံးနှင့် ဒေတာကို ဖျက်ပါမည်။"</string>
@@ -3453,7 +3457,7 @@
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS စာတိုစနစ်အတွက် ဆင်းမ်ကတ် ရွေးပါ"</string>
     <string name="data_switch_started" msgid="6292759843974720112">"ဒေတာ SIM ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ဖြင့် ခေါ်ဆိုရန်"</string>
-    <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
+    <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကတ်ကို ရွေးရန်"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_editor_name" msgid="5900178038499314621">"ဆင်းမ် အမည်"</string>
     <string name="sim_name_hint" msgid="8231524869124193119">"ဆင်းမ်အမည် ရိုက်ထည့်ပါ"</string>
@@ -3461,7 +3465,7 @@
     <string name="sim_editor_carrier" msgid="2424593350691002557">"စီမံပေးသူ"</string>
     <string name="sim_editor_number" msgid="3209002966895156006">"နံပါတ်"</string>
     <string name="sim_editor_color" msgid="9067029630083892961">"ဆင်းမ် အရောင်"</string>
-    <string name="sim_card_select_title" msgid="8146523005929848793">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
+    <string name="sim_card_select_title" msgid="8146523005929848793">"ဆင်းမ် ကတ်ကို ရွေးရန်"</string>
     <string name="color_orange" msgid="216547825489739010">"လိမ္မော်"</string>
     <string name="color_purple" msgid="6603701972079904843">"ခရမ်း"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"ဆင်းမ် ကဒ်များ မထည့်သွင်းရသေး"</string>
@@ -3581,7 +3585,7 @@
     <string name="keywords_display_adaptive_sleep" msgid="4905300860114643966">"စမတ်၊ ဖန်သားပြင် အရောင်မှိန်ခြင်း၊ နားခြင်း၊ ဘက်ထရီ၊ အချိန်ကုန်သွားခြင်း၊ အာရုံစိုက်ခြင်း၊ ဖန်သားပြင်မြင်ကွင်း၊ ဖန်သားပြင်၊ အသုံးပြုမှုမရှိခြင်း"</string>
     <string name="keywords_auto_rotate" msgid="7288697525101837071">"ကင်မရာ၊ စမတ်၊ အလိုအလျောက်လှည့်သည်၊ အလိုအလျောက်လှည့်သည်၊ လှည့်သည်၊ လှန်ခြင်း၊ လှည့်ခြင်း၊ ဒေါင်လိုက်၊ အလျားလိုက်၊ အနေအထား၊ ဒေါင်လိုက်၊ ရေပြင်ညီ"</string>
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"အဆင့်မြှင့်တင်ရန်၊ android"</string>
-    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd၊ အစီအစဉ်၊ အကြောင်းကြားချက်များ၊ အသံတိတ်၊ တုန်ခါခြင်း၊ နားခြင်း၊ အလုပ်၊ ပြတ်သားအောင် ချိန်ခြင်း၊ အသံ၊ အသံတိတ်ရန်၊ နေ့၊ ကြားရက်၊ စနေတနင်္ဂနွေ၊ ကြားရက်ည၊ အစီအစဉ်"</string>
+    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd၊ အစီအစဉ်၊ အကြောင်းကြားချက်များ၊ အသံတိတ်၊ တုန်ခါခြင်း၊ နားခြင်း၊ အလုပ်၊ ပြတ်သားအောင် ချိန်ခြင်း၊ အသံ၊ အသံပိတ်ရန်၊ နေ့၊ ကြားရက်၊ စနေတနင်္ဂနွေ၊ ကြားရက်ည၊ အစီအစဉ်"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"မျက်နှာပြင်၊ လော့ခ်ချချိန်၊ သက်တမ်းကုန်ချိန်၊ လော့ခ်မျက်နှာပြင်"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"မှတ်ဉာဏ်၊ ကက်ရှ်၊ ဒေတာ၊ ဖျက်ရန်၊ ရှင်းရန်၊ အလွတ်၊ နေရာ"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"ချိတ်ဆက်ထားသည်၊ စက်ပစ္စည်း၊ နားကြပ်များ၊ မိုက်ခွက်ပါနားကြပ်၊ စပီကာ၊ ကြိုးမဲ့၊ တွဲချိတ်ရန်၊ နားကြပ်၊ တေးဂီတ၊ မီဒီယာ"</string>
@@ -3712,7 +3716,7 @@
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"သင်ပိတ်လိုက်သည် အထိ"</string>
     <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{၁ နာရီ}other{# နာရီ}}"</string>
     <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{၁ မိနစ်}other{# မိနစ်}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ပိတ်ရန်}=1{ပိတ်ရန် / အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}other{ပိတ်ရန် / အချိန်ဇယား # ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ပိတ်}=1{ပိတ် / အစီအစဉ် ၁ ခု အလိုအလျောက် ဖွင့်နိုင်သည်}other{ပိတ် / အစီအစဉ် # ခု အလိုအလျောက် ဖွင့်နိုင်သည်}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'မနှောင့်ယှက်ရ\' ကို ကြားဖြတ်နိုင်သည့်အရာ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"လူများ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"အက်ပ်များ"</string>
@@ -3886,7 +3890,7 @@
     <string name="notification_importance_default_title" msgid="8875198696330289686">"အရေးကြီး"</string>
     <string name="notification_importance_high_title" msgid="394129291760607808">"ဖန်သားပြင်ပေါ်တွင် ပြရန်"</string>
     <string name="notification_block_title" msgid="7392909527700971673">"ပိတ်ထားပါ"</string>
-    <string name="notification_silence_title" msgid="4085829874452944989">"အသံတိတ်ရန်"</string>
+    <string name="notification_silence_title" msgid="4085829874452944989">"အသံပိတ်ရန်"</string>
     <string name="notification_alert_title" msgid="1632401211722199217">"မူလ"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"ကြားဖြတ်သတိပေးချက်များကို ခွင့်ပြုရန်"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"အက်ပ်အား အသံမြည်ခြင်း၊ တုန်ခါခြင်းနှင့်/ သို့မဟုတ် မျက်နှာပြင်ပေါ်တွင် သတိပေးချက်များဖော်ပြခွင့် ပေးပါ"</string>
@@ -3952,12 +3956,12 @@
     <string name="display_vr_pref_title" msgid="4850474436291113569">"စက်ပစ္စည်းသည် VR မုဒ်တွင် ရှိနေစဉ်"</string>
     <string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"မှုန်ဝါးမှုကို လျှော့ချပါ (အကြံပြုထားသည်)"</string>
     <string name="display_vr_pref_off" msgid="4008841566387432721">"မီးရောင်လက်မှုကို လျှော့ချပါ"</string>
-    <string name="picture_in_picture_title" msgid="9001594281840542493">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
-    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"ထည့်သွင်းထားသည့် အက်ပ်တစ်ခုမျှ မျက်နှာပြင်ပေါ်တွင် တစ်ခုပေါ်တစ်ခု ထပ်၍ဖွင့်ခြင်းကို ခွင့်မပြုပါ"</string>
-    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခွင့်ပြုရန်"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် ထွက်လိုက်စဉ်တွင် ဤအက်ပ်အား တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်သည့် ဝင်းဒိုးတစ်ခု ပြုလုပ်ခွင့်ပြုပါ (ဥပမာ ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးကို သင်သုံးနေသော အခြားအက်ပ်များ၏အပေါ်တွင် ပြသပါလိမ့်မည်။"</string>
+    <string name="picture_in_picture_title" msgid="9001594281840542493">"နှစ်ခုထပ်၍ ကြည့်ခြင်း"</string>
+    <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"ထည့်သွင်းထားသည့် အက်ပ်တစ်ခုမျှ နှစ်ခုထပ်၍ကြည့်ခြင်းကို ခွင့်မပြုပါ"</string>
+    <string name="picture_in_picture_keywords" msgid="3605379820551656253">"နှစ်ခုထပ်၍ ကြည့်ခြင်း"</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"နှစ်ခုထပ်၍ ကြည့်ခြင်း"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"နှစ်ခုထပ်၍ ကြည့်ခြင်း ခွင့်ပြုရန်"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် ထွက်လိုက်စဉ်တွင် ဤအက်ပ်အား နှစ်ခုထပ်၍ကြည့်သည့် ဝင်းဒိုးတစ်ခု ပြုလုပ်ခွင့်ပေးပါ (ဥပမာ ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးကို သင်သုံးနေသော အခြားအက်ပ်များ၏အပေါ်တွင် ပြသပါလိမ့်မည်။"</string>
     <string name="interact_across_profiles_title" msgid="7285906999927669971">"ချိတ်ဆက်ထားသော အလုပ်နှင့် ကိုယ်ရေးသုံး အက်ပ်များ"</string>
     <string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"ချိတ်ဆက်ထားသည်"</string>
     <string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"ချိတ်ဆက်မထားပါ"</string>
@@ -5113,7 +5117,7 @@
     <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"အောက်ပါအတွက် ပါဝါနှင့် အသံချဲ့ခလုတ် အတူတကွနှိပ်ပါ-"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="4529077822282099235">"ဖုန်းမမြည်ရန် ဖြတ်လမ်းလင့်ခ်"</string>
     <string name="prevent_ringing_option_vibrate" msgid="5456962289649581737">"တုန်ခါရန်"</string>
-    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"အသံတိတ်ရန်"</string>
+    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"အသံပိတ်ရန်"</string>
     <string name="prevent_ringing_option_none" msgid="7776676007180834163">"ပြောင်းလဲမှု မလုပ်ပါနှင့်"</string>
     <string name="prevent_ringing_option_vibrate_summary" msgid="3435299885425754304">"တုန်ခါသည်"</string>
     <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"အသံတိတ်သည်"</string>
@@ -5334,7 +5338,7 @@
     <string name="contextual_card_dismiss_keep" msgid="440516181066490747">"သိမ်းထားရန်"</string>
     <string name="contextual_card_dismiss_confirm_message" msgid="6434344989238055188">"ဤအကြံပြုချက်ကို ဖယ်ရှားမလား။"</string>
     <string name="contextual_card_removed_message" msgid="5755438207494260867">"အကြံပြုချက်များကို ဖယ်ရှားပြီးပါပြီ"</string>
-    <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"တစ်ဆင့် နောက်ပြန်ရန်"</string>
+    <string name="contextual_card_undo_dismissal_text" msgid="5200381837316691406">"နောက်ပြန်ရန်"</string>
     <string name="low_storage_summary" msgid="1979492757417779718">"သိုလှောင်ခန်း ကုန်ခါနီး။ <xliff:g id="PERCENTAGE">%1$s</xliff:g> သုံးထား - <xliff:g id="FREE_SPACE">%2$s</xliff:g> လွတ်"</string>
     <string name="contextual_card_feedback_send" msgid="7409408664417908922">"အကြံပြုချက် ပို့ရန်"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"ဤအကြံပြုမှုအပေါ် ထင်မြင်ချက် ပေးလိုသလား။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 15314c9..a532dd5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Det er mulig at du må skrive inn denne PIN-koden også på den andre enheten."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Det er mulig at du må oppgi dette passordet også på den andre enheten."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Sånn kobler du til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kontroller at dette passordet vises:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekreft for å koble til det koordinerte settet"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Fra:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vil du koble til denne enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Sånn kobler du til: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Skriv inn følgende: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, og trykk deretter på Retur eller Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Gi tilgang til kontaktene dine og anropsloggen din"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kunne ikke koble til. Prøv på nytt."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhetsdetaljer"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhetens Bluetooth-adresse: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhetens Bluetooth-adresse:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vil du glemme enheten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Fjern tilknytning"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vil du koble fra appen?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Husk innstillinger"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimalt antall Bluetooth-lydenheter"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Velg maksimalt antall tilkoblede Bluetooth-lydenheter"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Feilsøkingslogg for NFC-stabel"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Øk loggføringsnivå for NFC-stabel"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"speil"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Slå på trådløs skjermdeling"</string>
@@ -2272,7 +2276,7 @@
     <string name="accessibility_settings_summary" msgid="2366627644570558503">"Skjerm, interaksjon, lyd"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Synsinnstillinger"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
-    <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Endre skriftstørrelse"</string>
+    <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Endre skrift­­størrelse"</string>
     <string name="screen_reader_category_title" msgid="5825700839731107803">"Skjermleser"</string>
     <string name="captions_category_title" msgid="574490148949400274">"Teksting"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Lyd"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Lading er midlertidig begrenset"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"For å forlenge batterilevetiden. Finn ut mer."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Gjenoppta ladingen"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Under visse omstendigheter, for eksempel høye temperaturer og lange ladetider, kan lading begrenses til <xliff:g id="PERCENT">%1$s</xliff:g> for å bevare batteritilstanden.\n\nNår disse omstendighetene avsluttes, lader telefonen automatisk som normalt."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Under visse omstendigheter, for eksempel høye temperaturer og lange ladetider, kan lading begrenses til <xliff:g id="PERCENT">%1$s</xliff:g> for å bevare batteritilstanden.\n\nNår disse omstendighetene avsluttes, lader nettbrettet automatisk som normalt."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Under visse omstendigheter, for eksempel høye temperaturer og lange ladetider, kan ladingen begrenses til <xliff:g id="PERCENT">%1$s</xliff:g> for å bevare batteriet.\n\nNår slike omstendigheter er over, gjenopptar telefonen automatisk normal lading."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Under visse omstendigheter, for eksempel høye temperaturer og lange ladetider, kan ladingen begrenses til <xliff:g id="PERCENT">%1$s</xliff:g> for å bevare batteriet.\n\nNår slike omstendigheter er over, gjenopptar telefonen automatisk normal lading."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Siden du har brukt telefonen mer enn vanlig, kan batteriet gå tomt raskere enn normalt.\n\nApper med høyest batteribruk:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Siden du har brukt nettbrettet mer enn vanlig, kan batteriet gå tomt raskere enn normalt.\n\nApper med høyest batteribruk:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Siden du har brukt enheten mer enn vanlig, kan batteriet gå tomt raskere enn normalt.\n\nApper med høyest batteribruk:"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 3d35906..4345ef9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"तपाईँले अर्को उपकरणमा पनि PIN टाइप गर्न पर्ने हुन सक्छ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"तपाईँले सायद यो पासकि अन्य उपकरणमा पनि टाइप गर्नुपर्छ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को साथ जोडी पार्न निश्चित गर्नुहोस् यसले यो पास कुञ्जी देखाइरहेको छ <xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"समायोजित सेटमा कनेक्ट गर्न पुष्टि गर्नुहोस्"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"बाट: &lt;br&gt; &lt;b&gt; <xliff:g id="DEVICE_NAME">%1$s</xliff:g> &lt;/ b&gt; यस उपकरणका साथ जोडा बाँध्ने हो?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>सँग जोडी गर्न यसमा टाइप गर्नुहोस्: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> अनि रिटर्न वा इन्टर थिच्नुहोस्।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"आफ्ना सम्पर्क ठेगाना र फोन सम्पर्कको इतिहास हेर्ने अनुमति दिनुहोस्"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"जडान गर्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"डिभाइसको विवरण"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"डिभाइसको ब्लुटुथ एड्रेस: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"डिभाइसको ब्लुटुथ ठेगाना: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"डिभाइस बिर्सने हो?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"डिस्कनेक्ट गर्नुहोस्"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"एप डिस्कनेक्ट गर्ने हो?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"सेटिङहरू सम्झनुहोस्"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"जडान भएका ब्लुटुथ अडियो डिभाइसहरूको अधिकतम सङ्ख्या"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"जडान भएका ब्लुटुथ अडियो डिभाइसहरूको अधिकतम सङ्ख्या चयन गर्नुहोस्"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC स्ट्याकको डिबग लग"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC स्ट्याकको लगिङ लेभल बढाउनुहोस्"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"स्क्रिन मिरर गर्नुहोस्"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"वायरलेस प्रदर्शन सक्षम गर्नुहोस्"</string>
@@ -3580,7 +3584,7 @@
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री, स्मार्ट चमक, गतिशील चमक, स्वतः चमक"</string>
     <string name="keywords_display_adaptive_sleep" msgid="4905300860114643966">"स्मार्ट, मधुरो स्क्रिन मोड, स्लिप, ब्याट्री, टाइम आउट, स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधा, डिस्प्ले, स्क्रिन, निष्क्रियता"</string>
     <string name="keywords_auto_rotate" msgid="7288697525101837071">"क्यामेरा, स्मार्ट, अटो रोटेट, रोटेट, फ्लिप, रोटेसन, पोर्ट्रेट, ल्यान्डस्केप, ओरियन्टेसन, ठाडो, तेर्सो"</string>
-    <string name="keywords_system_update_settings" msgid="5769003488814164931">"स्तरवृद्धि गर्नुहोस्, android"</string>
+    <string name="keywords_system_update_settings" msgid="5769003488814164931">"अपग्रेड गर्नुहोस्, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, समयतालिका, सूचनाहरू, रोक लगाउनुहोस्, माैन, कम्पन, शयन अवस्थामा लानुहोस्, कार्य, फोकस, आवाज, म्युट गर्नुहोस्, दिन, काम गर्ने दिन, सप्ताहान्त, काम गर्ने रात, कार्यक्रम"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"स्क्रिन, लक समय, टाइमआउट, लकस्क्रिन"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"मेमोरी, क्यास, डेटा, मेट्नुहोस्, खाली गर्नुहोस्, खाली, ठाउँ"</string>
@@ -4014,7 +4018,7 @@
     <string name="app_notification_block_summary" msgid="1804611676339341551">"यी सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_content_block_title" msgid="6689085826061361351">"सूचनाहरू देखाउनुहोस्"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"ओझेलमा वा पेरिफेरल यन्त्रहरूमा कहिल्यै सूचनाहरू नदेखाउनुहोस्"</string>
-    <string name="notification_badge_title" msgid="6854537463548411313">"सूचना जनाउने नयाँ सूचना आएको जनाउने थोप्लो देखाउन दिइयोस्"</string>
+    <string name="notification_badge_title" msgid="6854537463548411313">"नयाँ सूचना आएको जनाउने थोप्लो देखाउन दिइयोस्"</string>
     <string name="notification_channel_badge_title" msgid="6505542437385640049">"सूचना जनाउने थोप्लो देखाइयोस्"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"बाधा नपुर्याउनुहोस् नामक सुविधा ओभरराइड गरियोस्"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"बाधा नपुर्‍याउनुहोस् नामक सुविधा अन भएका बेला पनि यी सूचना आइरहन दिइयोस्"</string>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index b61a98d..946cd91 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -28,10 +28,6 @@
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
-        <item name="android:textColorPrimaryInverse">@android:color/black</item>
-    </style>
-
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="android:colorError">@color/settings_dialog_colorError</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2df67bb..b5cc6de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -212,7 +212,7 @@
       <item quantity="other">Geselecteerde talen verwijderen?</item>
       <item quantity="one">Geselecteerde taal verwijderen?</item>
     </plurals>
-    <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Tekst wordt weergegeven in een andere taal."</string>
+    <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Tekst wordt getoond in een andere taal."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Kan niet alle talen verwijderen"</string>
     <string name="dlg_remove_locales_error_message" msgid="6504279959974675302">"Behoud minimaal één voorkeurstaal"</string>
     <string name="locale_not_translated" msgid="5079729745235316146">"Mogelijk niet beschikbaar in sommige apps"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Je moet deze pincode wellicht ook opgeven op het andere apparaat."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Je moet deze toegangscode wellicht ook opgeven op het andere apparaat."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Koppelen met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Zorg ervoor dat de volgende toegangscode wordt vermeld:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bevestigen om te koppelen met de gecoördineerde set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Koppelen met dit apparaat?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Koppelen met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Typ het volgende:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> en druk op Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Toegang geven tot je contacten en gespreksgeschiedenis"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Kan geen verbinding maken. Probeer het opnieuw."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Apparaatgegevens"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth-adres van je apparaat: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth-adres van apparaat:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Apparaat vergeten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Koppeling verwijderen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"App ontkoppelen?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Instellingen onthouden"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum aantal verbonden bluetooth-audioapparaten"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecteer het maximum aantal verbonden Bluetooth-audioapparaten"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Foutopsporingslogboek voor NFC-stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Registratieniveau voor NFC-stack verhogen"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casten"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirroren"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Draadloze weergave aanzetten"</string>
@@ -5047,7 +5051,7 @@
     <string name="zen_suggestion_title" msgid="4555260320474465668">"\'Niet storen\' updaten"</string>
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Meldingen onderbreken om gefocust te blijven"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"De functie is niet beschikbaar"</string>
-    <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Deze functie staat uit omdat je telefoon erdoor wordt vertraagd"</string>
+    <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Deze functie is uitgezet omdat je telefoon erdoor wordt vertraagd"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Altijd een crashvenster tonen"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Toon altijd een venster bij gecrashte apps"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"App met ANGLE-functionaliteit selecteren"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 56070e3..5d882bb 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ଆପଣ ଏହି PIN ଅନ୍ୟ ଡିଭାଇସ୍‌ରେ ମଧ୍ୟ ଟାଇପ୍‌ କରିବା ଆବଶ୍ୟକ କରିପାରନ୍ତି।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ଏହି ପାସ୍‌-କୀକୁ ଅନ୍ୟ ଡିଭାଇସ୍‌ରେ ମଧ୍ୟ ଟାଇପ୍‌ କରିବା ଆବଶ୍ୟକ ହୋଇପରେ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ଏହା ସହ ପେୟାର୍‌ କରିବାକୁ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ନିଶ୍ଚିତ କରନ୍ତୁ ଏହା ଦେଖାଉଛି ପାସ୍‌‌କୀ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"କୋର୍ଡିନେଟ କରାଯାଇଥିବା ସେଟ ସହ ପେୟାର କରିବାକୁ ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ଏହାଙ୍କ ପାଖରୁ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ଏହି ଡିଭାଇସ୍‌ ସହ ପେୟାର୍‌ କରିବେ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ପେୟାର୍‌ କରିବା ପାଇଁ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ଏହା ଉପରେ ଟାଇପ୍ କରନ୍ତୁ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ତା’ପରେ ରିଟର୍ନ କିମ୍ୱା ଏଣ୍ଟର୍ ଦାବନ୍ତୁ।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଓ କଲ୍‌ ହିଷ୍ଟୋରୀକୁ ଆକ୍ସେସ୍ କରିବାର ଅନୁମତି‌ ଦିଅନ୍ତୁ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ସଂଯୋଗ କରିପାରୁନାହିଁ। ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ଡିଭାଇସ୍‌ର ବିବରଣୀ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ଡିଭାଇସ୍‌ର ବ୍ଲୁଟୁଥ ଠିକଣା ହେଉଛି: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ଡିଭାଇସର ବ୍ଲୁଟୁଥ ଠିକଣା:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ଡିଭାଇସ୍‌ଟିକୁ ଭୁଲିଯିବେ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ଆସୋସିଏସନକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ଆପକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ସେଟିଙ୍ଗଗୁଡ଼ିକ ମନେରଖ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ସର୍ବାଧିକ ସଂଯୁକ୍ତ ହୋଇଥିବା ବ୍ଲୁଟୂଥ୍‍‌ ଅଡିଓ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ସଂଯୁକ୍ତ ବ୍ଲୁଟୂଥ୍‍‌ ଅଡିଓ ଡିଭାଇସ୍‌ଗୁଡ଼ିକର ସର୍ବାଧିକ ସଂଖ୍ୟା ବାଛନ୍ତୁ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ଷ୍ଟାକ୍ ଡିବଗ୍ ଲଗ୍"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ଷ୍ଟାକ୍ ଲଗିଂ ଲେଭେଲକୁ ବଢ଼ାନ୍ତୁ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"କାଷ୍ଟ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ମିରର୍"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ୱେୟାରଲେସ୍‌ ପ୍ରଦର୍ଶନ ସକ୍ଷମ କରନ୍ତୁ"</string>
@@ -976,7 +980,7 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Wi‑Fiର ଇଣ୍ଟରନେଟ ଆକ୍ସେସ ନଥିବାବେଳେ ମୋବାଇଲ ଡାଟା ବ୍ୟବହାର କରନ୍ତୁ। ଡାଟା ବ୍ୟବହାର ଦେୟ ଲାଗୁ ହୋଇପାରେ।"</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"ନେଟ୍‌ୱାର୍କ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"ୱାଇ-ଫାଇ ପସନ୍ଦ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"ୱାଇ-ଫାଇ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍‌ ହୋଇଯାଉ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"ୱାଇ-ଫାଇ ସ୍ୱଚାଳିତ ଭାବେ ପୁଣି ଚାଲୁ ହୋଇଯାଏ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"ସ୍ୱଚାଳିତ ଭାବେ ୱାଇ-ଫାଇ ପୁଣି ଚାଲୁ ହେବନାହିଁ"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"ୱାଇ-ଫାଇ ନେଟ୍‌ୱାର୍କ"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"ଅଧିକ ବିକଳ୍ପ"</string>
@@ -3857,7 +3861,7 @@
     <string name="promote_conversation_title" msgid="4731148769888238722">"ଏହା ଏକ ବାର୍ତ୍ତାଳାପ ଅଟେ"</string>
     <string name="promote_conversation_summary" msgid="3890724115743515035">"ବାର୍ତ୍ତାଳାପ ବିଭାଗରେ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="manage_conversations" msgid="4440289604887824337">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପରିଚାଳନା କରନ୍ତୁ"</string>
-    <string name="priority_conversation_count_zero" msgid="3862289535537564713">"କୌଣସି ପ୍ରାଥମିକତା ଥିବା ବାର୍ତ୍ତାଳାପ ନାହିଁ"</string>
+    <string name="priority_conversation_count_zero" msgid="3862289535537564713">"ପ୍ରାଥମିକତା ଥିବା କୌଣସି ବାର୍ତ୍ତାଳାପ ନାହିଁ"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ଟି ପ୍ରାଥମିକତା ଥିବା ବାର୍ତ୍ତାଳାପ</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ଟି ପ୍ରାଥମିକତା ଥିବା ବାର୍ତ୍ତାଳାପ</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2afd8d1..6cd8c97 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -272,7 +272,7 @@
     <string name="zone_change_to_from_dst" msgid="686451769985774294">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ਨੂੰ ਸ਼ੁਰੂ ਹੋਵੇਗਾ।"</string>
     <string name="zone_info_exemplar_location_and_offset" msgid="2186042522225153092">"<xliff:g id="EXEMPLAR_LOCATION">%1$s</xliff:g> (<xliff:g id="OFFSET">%2$s</xliff:g>)"</string>
     <string name="zone_info_offset_and_name" msgid="3960192548990990152">"<xliff:g id="TIME_TYPE">%2$s</xliff:g> (<xliff:g id="OFFSET">%1$s</xliff:g>)"</string>
-    <string name="zone_info_footer" msgid="7004693956837388129">"<xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਹੋ ਰਹੀ ਹੈ। <xliff:g id="TRANSITION_DATE">%3$s</xliff:g> ਨੂੰ <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> ਸ਼ੁਰੂ ਹੋਵੇਗਾ।"</string>
+    <string name="zone_info_footer" msgid="7004693956837388129">"<xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g> ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। <xliff:g id="DST_TIME_TYPE">%2$s</xliff:g> <xliff:g id="TRANSITION_DATE">%3$s</xliff:g> ਤੋਂ ਸ਼ੁਰੂ ਹੁੰਦਾ ਹੈ।"</string>
     <string name="zone_info_footer_no_dst" msgid="8399585343328811158">"<xliff:g id="OFFSET_AND_NAME">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਹੋ ਰਹੀ ਹੈ। ਦਿਨ ਦੇ ਸਮੇਂ ਨੂੰ ਵਿੱਚ ਕੋਈ ਬਦਲਾਅ ਨਹੀਂ।"</string>
     <string name="zone_time_type_dst" msgid="9189689342265305808">"ਦਿਨ ਦੀ ਰੌਸ਼ਨੀ ਸੰਬੰਧੀ ਬਚਤ ਸਮਾਂ"</string>
     <string name="zone_time_type_standard" msgid="6865420715430680352">"ਮਿਆਰੀ ਸਮਾਂ"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ ਪਿੰਨ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਵੀ ਇਹ ਪਾਸਕੁੰਜੀ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਇਸ ਪਾਸਕੁੰਜੀ ਨੂੰ ਦਿਖਾ ਰਿਹਾ ਹੈ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ਤਾਲ-ਮੇਲ ਵਾਲੇ ਸੈੱਟ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ ਤਸਦੀਕ ਕਰੋ"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ਇਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ \'ਵਾਪਸ ਜਾਓ\' ਜਾਂ \'ਦਾਖਲ ਕਰੋ\' ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="device_details_title" msgid="1155622417516195481">"ਡੀਵਾਈਸ ਦੇ ਵੇਰਵੇ"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਭੁੱਲਣਾ ਹੈ?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"ਐਸੋਸੀਏਸ਼ਨ ਹਟਾਓ"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ਕੀ ਐਪ ਡਿਸਕਨੈਕਟ ਕਰਨੀ ਹੈ?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"ਵੱਧ ਤੋਂ ਵੱਧ ਕਨੈਕਟ ਕੀਤੇ ਬਲੂਟੁੱਥ ਆਡੀਓ ਡੀਵਾਈਸ ਚੁਣੋ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC ਸਟੈਕ ਡੀਬੱਗ ਲੌਗ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC ਸਟੈਕ ਲੌਗਿੰਗ ਪੱਧਰ ਵਧਾਓ"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ਕਾਸਟ ਕਰੋ"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ਸ਼ੀਸ਼ਾ"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
@@ -2611,9 +2615,9 @@
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ"</string>
+    <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ਅਣ-ਪ੍ਰਤਿਬੰਧਿਤ"</string>
     <string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ਸੁਯੋਗ ਬਣਾਈ ਗਈ"</string>
-    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ਪਾਬੰਦੀਸ਼ੁਦਾ"</string>
+    <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
     <string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"ਪਾਬੰਦੀਆਂ ਤੋਂ ਬਿਨਾਂ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੋਂ ਦੀ ਆਗਿਆ ਦਿਓ। ਵੱਧ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"ਆਪਣੀ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਸੁਯੋਗ ਬਣਾਓ। ਜ਼ਿਆਦਾਤਰ ਐਪਾਂ ਲਈ ਸਿਫ਼ਾਰਸ਼ੀ।"</string>
     <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਹੋਣ \'ਤੇ ਬੈਟਰੀ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਐਪ ਉਮੀਦ ਮੁਤਾਬਕ ਕੰਮ ਨਾ ਕਰੇ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
@@ -4819,8 +4823,8 @@
     <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ, ਹੋਮ ਬਟਨ \'ਤੇ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਸਾਰੀਆਂ ਐਪਾਂ ਦੇਖਣ ਲਈ, ਦੁਬਾਰਾ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਪਿੱਛੇ\' ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"ਨਵਾਂ ਹੋਮ ਬਟਨ ਅਜ਼ਮਾਓ"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ ਨਵੇਂ ਸੰਕੇਤ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"ਸੁਰੱਖਿਆ ਅਤੇ ਸੰਕਟਕਾਲ"</string>
-    <string name="emergency_dashboard_summary" msgid="401033951074039302">"ਸੰਕਟਕਾਲੀਨ ਸਹਾਇਤਾ, ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ, ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="emergency_settings_preference_title" msgid="6183455153241187148">"ਸੁਰੱਖਿਆ ਅਤੇ ਐਮਰਜੈਂਸੀ"</string>
+    <string name="emergency_dashboard_summary" msgid="401033951074039302">"ਐਮਰਜੈਂਸੀ ਸਹਾਇਤਾ, ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ, ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"ਇਸ਼ਾਰਾ ਨੈਵੀਗੇਸ਼ਨ"</string>
     <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਲਈ, ਹੇਠਾਂ ਤੋਂ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰਕੇ ਦਬਾਈ ਰੱਖੋ ਅਤੇ ਫਿਰ ਛੱਡੋ। ਵਾਪਸ ਜਾਣ ਲਈ, ਸਕ੍ਰੀਨ ਦੇ ਜਾਂ ਤਾਂ ਖੱਬੇ ਜਾਂ ਸੱਜੇ ਕਿਨਾਰੇ ਤੋਂ ਸਵਾਈਪ ਕਰੋ।"</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3-ਬਟਨ ਨੈਵੀਗੇਸ਼ਨ"</string>
@@ -5439,7 +5443,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ਬੰਦ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ਇੰਟਰਨੈੱਟ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ਸਿਮ"</string>
-    <string name="wifi_switch_summary" msgid="3577154777754849024">"ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭ ਕੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭ ਕੇ ਉਨ੍ਹਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ, ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ਕਾਲਾਂ ਅਤੇ SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Wi‑Fi ਕਾਲਿੰਗ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c7c15d9..1be5dca 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -303,10 +303,10 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Włącz lokalizację"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Wyłączono"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="few">Włączono – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacje mają dostęp do lokalizacji</item>
-      <item quantity="many">Włączono – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
-      <item quantity="other">Włączono – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
-      <item quantity="one">Włączono – <xliff:g id="COUNT_0">%1$d</xliff:g> aplikacja ma dostęp do lokalizacji</item>
+      <item quantity="few">Włączona – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacje mają dostęp do lokalizacji</item>
+      <item quantity="many">Włączona – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
+      <item quantity="other">Włączona – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
+      <item quantity="one">Włączona – <xliff:g id="COUNT_0">%1$d</xliff:g> aplikacja ma dostęp do lokalizacji</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Wczytuję…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacje z uprawnieniami dostępu do urządzeń w pobliżu mogą określać położenie połączonych urządzeń względem siebie."</string>
@@ -859,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Może być również konieczne wpisanie tego kodu PIN na drugim urządzeniu."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Może być również konieczne wpisanie tego klucza na drugim urządzeniu."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Aby sparować z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Upewnij się, że jest na nim wyświetlony następujący klucz:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potwierdź, aby sparować ze skoordynowanym zestawem"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Sparować z tym urządzeniem?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Aby sparować z urządzeniem <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, wpisz na nim klucz <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, a następnie naciśnij klawisz zatwierdzania."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zezwól na dostęp do kontaktów i historii połączeń"</string>
@@ -892,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nie udało się nawiązać połączenia. Spróbuj ponownie."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Szczegóły urządzenia"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adres Bluetooth urządzenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adres Bluetooth urządzenia: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zapomnieć urządzenie?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Usuń powiązanie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Odłączyć aplikację?"</string>
@@ -924,6 +926,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamiętaj ustawienia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksymalna liczba podłączonych urządzeń audio Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Wybierz maksymalną liczbę podłączonych urządzeń audio Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Dziennik debugowania stosów NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zwiększ poziom rejestrowania stosów NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Przesyłanie ekranu"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"odbicie lustrzane"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Wyświetlacz bezprzewodowy"</string>
@@ -1010,8 +1014,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za użycie danych."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Dodaj sieć"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Ustawienia Wi‑Fi"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi włączy się automatycznie"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi nie włączy się automatycznie"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi włącza się automatycznie"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi nie włącza się automatycznie"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"Sieci Wi-Fi"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Więcej opcji"</string>
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"Wi‑Fi Direct"</string>
@@ -1532,7 +1536,7 @@
     <string name="kernel_version" msgid="3513538109381366881">"Wersja jądra"</string>
     <string name="build_number" msgid="9009733242117579826">"Numer kompilacji"</string>
     <string name="module_version" msgid="1787518340082046658">"Aktualizacja systemowa Google Play"</string>
-    <string name="device_info_not_available" msgid="4804474466616712326">"Niedostępna"</string>
+    <string name="device_info_not_available" msgid="4804474466616712326">"Niedostępny"</string>
     <string name="device_status_activity_title" msgid="1812666241137263882">"Stan telefonu"</string>
     <string name="device_status" msgid="7988547478034984649">"Stan telefonu"</string>
     <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"Stan baterii, sieci i inne informacje"</string>
@@ -2730,7 +2734,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Wyższe wykorzystanie baterii"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Zobacz aplikacje, które najbardziej wykorzystują baterię"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Ładowanie tymczasowo ograniczone"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Aby zmniejszyć zużycie baterii. Więcej informacji."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Aby wydłużyć żywotność baterii. Więcej informacji."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Wznów ładowanie"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"W niektórych warunkach (np. przy długotrwałym ładowaniu i wysokiej temperaturze) ładowanie może być ograniczone do <xliff:g id="PERCENT">%1$s</xliff:g>, ponieważ pomaga to utrzymać baterię w dobrym stanie.\n\nGdy te warunki się zmienią, telefon automatycznie przejdzie do normalnego ładowania."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"W niektórych warunkach (np. przy długotrwałym ładowaniu i wysokiej temperaturze) ładowanie może być ograniczone do <xliff:g id="PERCENT">%1$s</xliff:g>, ponieważ pomaga to utrzymać baterię w dobrym stanie.\n\nGdy te warunki się zmienią, telefon automatycznie przejdzie do normalnego ładowania."</string>
@@ -3844,7 +3848,7 @@
     <string name="conversation_notifs_category" msgid="2549844862379963273">"Rozmowa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Ostatnio wysłane"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobacz wszystkie z ostatnich 7 dni"</string>
-    <string name="general_notification_header" msgid="3669031068980713359">"Zarządzaj"</string>
+    <string name="general_notification_header" msgid="3669031068980713359">"Zarządzanie"</string>
     <string name="app_notification_field" msgid="3858667320444612716">"Ustawienia aplikacji"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"Zarządzaj powiadomieniami z poszczególnych aplikacji"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"Ogólne"</string>
@@ -3916,7 +3920,7 @@
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Gdy profil służbowy jest zablokowany"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Powiadomienia na ekranie blokady"</string>
     <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Pokazuj rozmowy, domyślne i ciche"</string>
-    <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ukryj ciche rozmowy i powiadomienia"</string>
+    <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ukrywaj ciche rozmowy i powiadomienia"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Nie pokazuj żadnych powiadomień"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Powiadomienia poufne"</string>
     <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"Pokazuj treści poufne po zablokowaniu"</string>
@@ -4017,7 +4021,7 @@
       <item quantity="one">%d aplikacja może odczytywać powiadomienia</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Ulepszone powiadomienia"</string>
-    <string name="notification_assistant_summary" msgid="1957783114840908887">"Otrzymuj sugestie działań oraz odpowiedzi i inne podpowiedzi"</string>
+    <string name="notification_assistant_summary" msgid="1957783114840908887">"Sugeruj działania, odpowiedzi itd."</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Brak"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do powiadomień."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Zezwalaj na dostęp do powiadomień"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e76fbe5..b99449e 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -132,7 +132,7 @@
     <string name="bluetooth_remember_choice" msgid="173821849670438110">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Não perguntar novamente"</string>
     <string name="bluetooth_map_request" msgid="8664081227240707479">"Solicitação de acesso a mensagens"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s deseja acessar suas mensagens. Permitir acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"Solicitação de acesso ao chip"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos."</string>
@@ -320,7 +320,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponível"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status da segurança"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"Bloqueio de tela, Encontre Meu Dispositivo, segurança do app"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"Bloqueio de tela, Encontre Meu Dispositivo, Segurança dos apps"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Toque para configurar o Desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Desbloqueio facial"</string>
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para parear com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para parear com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Digite no dispositivo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>. Em seguida, pressione Voltar ou Entrar."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de chamadas"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Esquecer dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Desconectar o app?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuração da pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumentar o nível de registros da pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1430,7 +1434,7 @@
     <string name="screensaver_settings_button" msgid="6159236558934930238">"Configurações"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"Levantar para ativar"</string>
-    <string name="ambient_display_screen_title" msgid="8615947016991429325">"Visualização na tela"</string>
+    <string name="ambient_display_screen_title" msgid="8615947016991429325">"Tela ambiente"</string>
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Quando mostrar"</string>
     <string name="doze_title" msgid="1523090408230862316">"Ativar tela para notificações"</string>
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
@@ -2271,7 +2275,7 @@
     <string name="usage_time_label" msgid="9105343335151559883">"Tempo de uso"</string>
     <string name="accessibility_settings" msgid="4713215774904704682">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Configurações de acessibilidade"</string>
-    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Tela, interação, áudio"</string>
+    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Exibição, interação, áudio"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Mudar o tamanho da fonte"</string>
@@ -2279,7 +2283,7 @@
     <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
     <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
-    <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
+    <string name="display_category_title" msgid="6638191682294461408">"Exibição"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
@@ -2670,7 +2674,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Maior uso da bateria"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Ver apps com maior uso"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Carregamento temporariamente limitado"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Isso economiza a bateria. Saiba mais."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para economia de bateria. Saiba mais."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Retomar o carregamento"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Em determinadas condições, como temperaturas altas ou longos períodos de carregamento, a carga pode ser limitada a <xliff:g id="PERCENT">%1$s</xliff:g> para preservar a integridade da bateria.\n\nQuando sair de uma condição assim, o smartphone voltará a ser carregado normalmente."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Em determinadas condições, como temperaturas altas ou longos períodos de carregamento, a carga pode ser limitada a <xliff:g id="PERCENT">%1$s</xliff:g> para preservar a integridade da bateria.\n\nQuando sair de uma condição assim, o tablet voltará a ser carregado normalmente."</string>
@@ -3574,7 +3578,7 @@
     <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"tema, claro, escuro, modo, sensibilidade à luz, fotofobia, escurecer, deixar mais escuro, modo escuro, enxaqueca"</string>
     <string name="keywords_systemui_theme" msgid="6341194275296707801">"tema escuro"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"bug"</string>
-    <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Exibição ambiente, exibição de tela de bloqueio"</string>
+    <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Tela ambiente, exibição na tela de bloqueio"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"notificação de tela de bloqueio, notificações"</string>
     <string name="keywords_face_settings" msgid="1360447094486865058">"rosto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impressão digital, adicionar impressão digital"</string>
@@ -3757,7 +3761,7 @@
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"Gerenciar"</string>
-    <string name="app_notification_field" msgid="3858667320444612716">"Configurações do app"</string>
+    <string name="app_notification_field" msgid="3858667320444612716">"Configurações de apps"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"Controlar as notificações de apps individuais"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
@@ -3781,7 +3785,7 @@
     <string name="history_toggled_on_summary" msgid="9034278971358282728">"As notificações recentes e adiadas aparecerão aqui"</string>
     <string name="notification_history_view_settings" msgid="5269317798670449002">"ver configurações de notificação"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificação"</string>
-    <string name="snooze_options_title" msgid="2109795569568344617">"Permitir soneca para notificações"</string>
+    <string name="snooze_options_title" msgid="2109795569568344617">"Permitir adiar notificações"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Ocultar ícones das notificações discretas"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Os ícones de notificações discretas não são exibidos na barra de status"</string>
     <string name="notification_badging_title" msgid="5469616894819568917">"Ponto de notificação no ícone do app"</string>
@@ -3912,7 +3916,7 @@
       <item quantity="other">Cerca de <xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do app e do dispositivo"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações de apps e do dispositivo"</string>
     <string name="manage_notification_access_summary" msgid="2907135226478903997">"Controlar quais apps e dispositivos podem ler as notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Os apps não podem ler notificações"</string>
@@ -3920,13 +3924,13 @@
       <item quantity="one">%d apps podem ler notificações</item>
       <item quantity="other">%d apps podem ler notificações</item>
     </plurals>
-    <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações aprimoradas"</string>
+    <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações avançadas"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Receber sugestões de ações, respostas e muito mais"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Nenhuma"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Nenhum app instalado solicitou o acesso a notificações."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Permitir acesso às notificações"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Permitir que o app <xliff:g id="SERVICE">%1$s</xliff:g> acesse as notificações?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"No Android 12, as notificações aprimoradas substituíram as notificações adaptáveis. Esse recurso exibe ações e respostas sugeridas, além de organizar suas notificações. \n\nAs notificações aprimoradas podem acessar o conteúdo das notificações, incluindo informações pessoais como nomes de contatos e mensagens. Elas também podem dispensar ou responder às notificações, como atender chamadas telefônicas e controlar o Não perturbe."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"No Android 12, as notificações avançadas substituíram as notificações adaptáveis. Esse recurso exibe ações e respostas sugeridas, além de organizar suas notificações. \n\nAs notificações avançadas podem acessar o conteúdo das notificações, incluindo informações pessoais como nomes de contatos e mensagens. Elas também podem dispensar ou responder às notificações, como atender chamadas telefônicas e controlar o Não perturbe."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Permitir que <xliff:g id="SERVICE">%1$s</xliff:g> acesse as notificações?"</string>
     <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. O app também poderá adiar ou dispensar notificações ou acionar botões que elas contenham, incluindo atender chamadas telefônicas. \n\nIsso também autoriza o app a ativar ou desativar o modo Não perturbe e mudar as configurações relacionadas."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Se você desativar o acesso a notificações para <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, é possível que o acesso ao Não perturbe também seja desativado."</string>
@@ -5441,7 +5445,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
-    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e se conectar a elas"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e conectar"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Chamada no Wi-Fi"</string>
@@ -5494,10 +5498,10 @@
     <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="5111712860712823893">"Um dispositivo quer acessar suas mensagens. Toque para ver detalhes."</string>
-    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Permitir acesso às mensagens?"</string>
     <string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"Um dispositivo Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quer acessar suas mensagens.\n\nVocê nunca se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="9175220052703433637">"Um dispositivo quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
-    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Permitir acesso aos contatos e ao registro de chamadas?"</string>
     <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Um dispositivo Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê nunca se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="category_name_brightness" msgid="8520372392029305084">"Brilho"</string>
     <string name="category_name_lock_display" msgid="8310402558217129670">"Tela de bloqueio"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7bc69a1..d8f8408 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -24,8 +24,8 @@
     <string name="confirmation_turn_on" msgid="2979094011928347665">"Ativar"</string>
     <string name="device_info_default" msgid="1406619232867343310">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
-      <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
       <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passos de se tornar um programador.</item>
+      <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="7041756429707644630">"Não é necessário, já é um programador."</string>
@@ -209,8 +209,8 @@
     <string name="locale_remove_menu" msgid="3521546263421387474">"Remover"</string>
     <string name="add_a_language" msgid="2126220398077503271">"Adicionar um idioma"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
-      <item quantity="other">Remover os idiomas selecionados?</item>
       <item quantity="one">Remover o idioma selecionado?</item>
+      <item quantity="other">Remover os idiomas selecionados?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"O texto será apresentado noutro idioma."</string>
     <string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Não é possível remover todos os idiomas"</string>
@@ -299,8 +299,8 @@
     <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilizar a localização"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
-      <item quantity="other">Ativada – <xliff:g id="COUNT_1">%1$d</xliff:g> apps têm acesso à localização</item>
       <item quantity="one">Ativada – <xliff:g id="COUNT_0">%1$d</xliff:g> app tem acesso à localização</item>
+      <item quantity="other">Ativada – <xliff:g id="COUNT_1">%1$d</xliff:g> apps têm acesso à localização</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"A carregar…"</string>
     <string name="location_settings_footer_general" msgid="1040507068701188821">"As apps com a autorização Dispositivos próximos podem determinar a posição relativa dos dispositivos ligados."</string>
@@ -403,8 +403,8 @@
     <string name="fingerprint_add_title" msgid="1837610443487902050">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"bloqueio de ecrã"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="6897454766137108776">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> impressões digitais adicionadas</item>
       <item quantity="one">Impressão digital adicionada</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> impressões digitais adicionadas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configure a sua impressão digital"</string>
@@ -740,21 +740,21 @@
     <string name="lock_failed_attempts_now_wiping_profile" msgid="3171880997211568208">"Demasiadas tentativas incorretas. Este perfil de trabalho e os respetivos dados serão eliminados."</string>
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorar"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
-      <item quantity="other">Tem de ter, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> carateres.</item>
       <item quantity="one">Tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> caráter.</item>
+      <item quantity="other">Tem de ter, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> carateres.</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
-      <item quantity="other">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> dígitos</item>
       <item quantity="one">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_0">%d</xliff:g> dígito</item>
+      <item quantity="other">O PIN tem de incluir, pelo menos, <xliff:g id="COUNT_1">%d</xliff:g> dígitos</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuar"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
-      <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> carateres.</item>
       <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> caráter.</item>
+      <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> carateres.</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
-      <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos.</item>
       <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito.</item>
+      <item quantity="other">Tem de ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O gestor do dispositivo não permite utilizar um PIN recente"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caráter inválido"</string>
@@ -762,32 +762,32 @@
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tem de incluir, pelo menos, um dígito"</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Tem de incluir, pelo menos, um símbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
-      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam números.</item>
       <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja um número.</item>
+      <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam números.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
@@ -801,15 +801,15 @@
     <string name="manage_device_admin" msgid="1044620606203916275">"Apps de administração do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Sem apps ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app ativa</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agentes fidedignos"</string>
     <string name="disabled_because_no_backup_security" msgid="4998095356607488854">"Para utilizar, defina primeiro um bloqueio de ecrã"</string>
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Nenhum"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
       <item quantity="one">1 agente fidedigno ativo</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"Ativar Bluetooth"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Poderá também ter de introduzir este PIN no outro aparelho."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Poderá também ter de introduzir a chave de acesso no outro aparelho."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para sincronizar com: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se apresenta esta chave de acesso: &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para sincronizar com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; Sincronizar com este aparelho?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para sincronizar com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduza no mesmo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> e, em seguida, prima Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos contactos e ao histórico de chamadas"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível ligar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Pretende esquecer o dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Pretende desassociar a app?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Memorizar definições"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de áudio Bluetooth associados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth associados."</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registo de depuração de pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumente o nível de registo de pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelhar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar display sem fios"</string>
@@ -1121,16 +1125,16 @@
     <string name="wifi_forget_dialog_title" msgid="4363829200968563164">"Esqueceu-se da rede?"</string>
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Todas as palavras-passe para esta rede serão eliminadas."</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
-      <item quantity="other">%d redes</item>
       <item quantity="one">1 rede</item>
+      <item quantity="other">%d redes</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
-      <item quantity="other">%d subscrições</item>
       <item quantity="one">1 subscrição</item>
+      <item quantity="other">%d subscrições</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
-      <item quantity="other">%d redes e subscrições</item>
       <item quantity="one">1 rede e subscrição</item>
+      <item quantity="other">%d redes e subscrições</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Wi-Fi Avançada"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
@@ -1299,8 +1303,8 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rodar ecrã automaticamente"</string>
-    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativada"</string>
-    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativada"</string>
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativado"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativado"</string>
     <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativada – Com base no rosto"</string>
     <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar deteção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
@@ -1473,8 +1477,8 @@
     <string name="sim_preferred_message" msgid="6004009449266648351">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no dispositivo. Pretende utilizar este cartão SIM para os dados móveis, as chamadas e as mensagens SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
-      <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
       <item quantity="one">Código PIN incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de ter de contactar operador p/ desbloquear dispos.</item>
+      <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Código PIN do SIM incorreto. Tem mais uma tentativa antes de ter de contactar o operador para desbloquear o dispositivo."</string>
     <string name="pin_failed" msgid="3726505565797352255">"Falha ao introduzir o PIN do cartão SIM!"</string>
@@ -1844,8 +1848,8 @@
     <string name="location_app_level_permissions" msgid="907206607664629759">"Autorizações de localização das apps"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localização está desativada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
-      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps têm acesso à localização</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps tem acesso à localização</item>
+      <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps têm acesso à localização</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="2558063524482178146">"Acesso recente"</string>
     <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Ver tudo"</string>
@@ -2020,8 +2024,8 @@
     <string name="install_applications_title" msgid="7890233747559108106">"Permit. todas as fontes app"</string>
     <string name="recent_app_category_title" msgid="189758417804427533">"Apps abertas recentemente"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
-      <item quantity="other">Ver todas as %1$d apps</item>
       <item quantity="one">Ver todas as apps</item>
+      <item quantity="other">Ver todas as %1$d apps</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacte o seu administrador de TI"</string>
     <string name="forgot_password_text" msgid="2583194470767613163">"Pode ajudar a repor o seu PIN, padrão ou palavra-passe."</string>
@@ -2040,8 +2044,8 @@
     <string name="clear_cache_btn_text" msgid="8597272828928143723">"Limpar cache"</string>
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
-      <item quantity="other">%d itens</item>
       <item quantity="one">1 item</item>
+      <item quantity="other">%d itens</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Limpar acesso"</string>
     <string name="controls_label" msgid="8671492254263626383">"Controlos"</string>
@@ -2389,7 +2393,7 @@
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"2 minutos"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"Limite de tempo para ações (Acessibilidade)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Tempo para tomar medidas"</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Escolha o tempo durante o qual pretende mostrar mensagens que lhe solicitam que tome medidas, mas que são visíveis apenas temporariamente.\n\nNem todas as aplicações são compatíveis com esta definição."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Escolha o tempo durante o qual pretende mostrar mensagens que lhe solicitam que tome medidas, mas que são visíveis apenas temporariamente.\n\nNem todas as apps são compatíveis com esta definição."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Atraso ao manter premida a tecla"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Inversão de cores"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Utilizar a inversão de cores"</string>
@@ -2431,8 +2435,8 @@
     <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Para sincronizar os aparelhos auditivos, localize os dispositivos no ecrã seguinte e toque nos mesmos. Certifique-se de que os aparelhos auditivos estão no modo de sincronização."</string>
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ativo"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
-      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelhos auditivos guardados.</item>
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> aparelho auditivo guardado.</item>
+      <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelhos auditivos guardados.</item>
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajuste de áudio"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Atalho ativado"</string>
@@ -2462,20 +2466,20 @@
     <string name="reduce_bright_colors_intensity_end_label" msgid="1422600205484299860">"Mais claro"</string>
     <string name="reduce_bright_colors_persist_preference_title" msgid="4368829654993343354">"Manter após reiniciar o dispositivo"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
-      <item quantity="other">Curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
       <item quantity="one">Curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
+      <item quantity="other">Curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
-      <item quantity="other">Médio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
       <item quantity="one">Médio (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
+      <item quantity="other">Médio (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
-      <item quantity="other">Longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
       <item quantity="one">Longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo)</item>
+      <item quantity="other">Longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> segundos)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
-      <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> segundos</item>
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_0">%1$s</xliff:g> segundo</item>
+      <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> segundos</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Toque <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, notificação <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>, resposta tátil <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
     <string name="accessibility_vibration_summary_off" msgid="7776105450117095736">"Toque e notificação definidos como Desativada"</string>
@@ -2565,12 +2569,12 @@
     <string name="print_settings" msgid="8519810615863882491">"Impressão"</string>
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Desativado"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
       <item quantity="one">1 serviço de impressão ativado</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
       <item quantity="one">1 tarefa de impressão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="7554057966540602692">"Nenhum serviço instalado"</string>
@@ -2677,24 +2681,24 @@
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Uma vez que tem utilizado o dispositivo mais do que o habitual, pode ficar sem bateria mais cedo do que o esperado.\n\nApps que utilizam mais bateria:"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclui atividade em segundo plano de potência elevada"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
-      <item quantity="other">Restringir %1$d apps</item>
       <item quantity="one">Restringir %1$d app</item>
+      <item quantity="other">Restringir %1$d apps</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
-      <item quantity="other">%2$d aplicações restringidas recentemente</item>
       <item quantity="one">%1$s aplicação restringida recentemente</item>
+      <item quantity="other">%2$d aplicações restringidas recentemente</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
-      <item quantity="other">%2$d aplicações têm uma utilização elevada da bateria em segundo plano.</item>
       <item quantity="one">%1$s aplicação tem uma utilização elevada da bateria em segundo plano.</item>
+      <item quantity="other">%2$d aplicações têm uma utilização elevada da bateria em segundo plano.</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
-      <item quantity="other">Não é possível executar estas aplicações em segundo plano.</item>
       <item quantity="one">Não é possível executar esta aplicação em segundo plano.</item>
+      <item quantity="other">Não é possível executar estas aplicações em segundo plano.</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
-      <item quantity="other">Restringir %1$d aplicações?</item>
       <item quantity="one">Restringir a app?</item>
+      <item quantity="other">Restringir %1$d aplicações?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Para poupar bateria, impeça que a aplicação <xliff:g id="APP">%1$s</xliff:g> consuma bateria em segundo plano. Esta aplicação poderá não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Para poupar bateria, impeça estas aplicações de consumir bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos.\n\nApps:"</string>
@@ -2713,8 +2717,8 @@
     <string name="smart_battery_footer" msgid="8407121907452993645">"Quando o Battery Manager deteta a existência de aplicações a consumir a bateria rapidamente, tem a opção de restringir estas aplicações. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"Apps restritas"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
-      <item quantity="other">Limiar a utilização da bateria para %1$d apps</item>
       <item quantity="one">Limitar a utilização da bateria para %1$d app</item>
+      <item quantity="other">Limiar a utilização da bateria para %1$d apps</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Restrita <xliff:g id="TIME">%1$s</xliff:g>."</string>
     <string name="restricted_app_detail_footer" msgid="3495725286882138803">"A utilização da bateria em segundo plano é restrita nestas apps. Podem não funcionar conforme esperado e as notificações podem sofrer atrasos."</string>
@@ -2723,8 +2727,8 @@
     <string name="battery_manager_summary" msgid="255708681438809287">"Detetar quando as apps consomem rapidamente a bateria"</string>
     <string name="battery_manager_off" msgid="673547668722420924">"Desativado"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
-      <item quantity="other">%1$d apps restritas</item>
       <item quantity="one">%1$d app restrita</item>
+      <item quantity="other">%1$d apps restritas</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="400958471814422770">"Ocorreu um problema ao ler o medidor da bateria."</string>
@@ -2989,8 +2993,8 @@
     <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Pretende remover esta app?"</string>
     <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Esta app não gere certificados, mas permanece no dispositivo. Quaisquer certificados instalados pela app serão desinstalados."</string>
     <plurals name="number_of_urls" formatted="false" msgid="403979258551655023">
-      <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URLs</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> URL</item>
+      <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> URLs</item>
     </plurals>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal para marcação de emergência"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
@@ -3037,8 +3041,8 @@
     <string name="notification_history_snooze" msgid="3980568893290512257">"Suspensas"</string>
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Ignoradas recentemente"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
-      <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notificações</item>
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notificação</item>
+      <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notificações</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Toque e vibração das chamadas"</string>
     <string name="wifi_setup_detail" msgid="2012898800571616422">"Detalhes da rede"</string>
@@ -3288,21 +3292,21 @@
     <string name="ssl_ca_cert_warning" msgid="3898387588657346106">"A rede pode ser monitorizada"</string>
     <string name="done_button" msgid="6269449526248267">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
-      <item quantity="other">Confiar ou remover os certificados</item>
       <item quantity="one">Confiar ou remover o certificado</item>
+      <item quantity="other">Confiar ou remover os certificados</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
-      <item quantity="other">Verificar certificados</item>
       <item quantity="one">Verificar certificado</item>
+      <item quantity="other">Verificar certificados</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Vários utilizadores"</string>
     <string name="user_settings_footer_text" product="device" msgid="7523914344521302179">"Partilhe o seu dispositivo ao adicionar novos utilizadores. Cada utilizador tem um espaço pessoal no dispositivo, onde pode guardar ecrãs principais personalizados, contas, aplicações, definições e muito mais."</string>
@@ -3482,8 +3486,8 @@
     <string name="sim_selection_channel_title" msgid="3193666315607572484">"Seleção de SIM"</string>
     <string name="dashboard_title" msgid="5660733037244683387">"Definições"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
-      <item quantity="other">Mostrar %d itens ocultos</item>
       <item quantity="one">Mostrar %d item oculto</item>
+      <item quantity="other">Mostrar %d itens ocultos</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Rede e Internet"</string>
     <string name="network_dashboard_summary_mobile" msgid="7750924671970583670">"Móvel, Wi‑Fi, zona Wi-Fi"</string>
@@ -3639,7 +3643,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legendas instantâneas"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Multimédia com legendas automáticas"</string>
-    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}other{# horários definidos}}"</string>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}one{# horário(s) definido(s)}other{# horários definidos}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não incomodar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limite as interrupções"</string>
@@ -3710,9 +3714,9 @@
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até desativar"</string>
-    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
-    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora(s)}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto(s)}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}one{Desativado/# horário(s) pode(m) ser ativado(s) automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o modo Não incomodar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3859,8 +3863,8 @@
     <string name="manage_conversations" msgid="4440289604887824337">"Gerir conversas"</string>
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Nenhuma conversa com prioridade"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversas com prioridade</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> conversa com prioridade</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversas com prioridade</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversas com prioridade"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da secção de conversas e surgem como balões flutuantes."</string>
@@ -3902,12 +3906,12 @@
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Todas as notificações da app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Notificações adaptáveis"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
-      <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por dia</item>
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por dia</item>
+      <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por dia</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
-      <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por semana</item>
+      <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do dispositivo e de apps"</string>
@@ -3915,8 +3919,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"As aplicações não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
-      <item quantity="other">%d aplicações podem ler notificações</item>
       <item quantity="one">%d aplicação pode ler notificações</item>
+      <item quantity="other">%d aplicações podem ler notificações</item>
     </plurals>
     <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações melhoradas"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Obtenha sugestões de ações, respostas e muito mais"</string>
@@ -3977,8 +3981,8 @@
     <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Esta app pode utilizar as autorizações da sua app pessoal <xliff:g id="NAME">%1$s</xliff:g>, como o acesso à localização, o armazenamento ou os contactos."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Não existem apps associadas"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps associadas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app associada</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps associadas</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Para associar estas apps, instale a app <xliff:g id="NAME">%1$s</xliff:g> no seu perfil de trabalho"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Para associar estas apps, instale a app <xliff:g id="NAME">%1$s</xliff:g> no seu perfil pessoal"</string>
@@ -3993,20 +3997,20 @@
     <string name="notification_channels" msgid="1502969522886493799">"Categorias"</string>
     <string name="notification_channels_other" msgid="18159805343647908">"Outra"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Esta aplicação não publicou notificações"</string>
     <string name="app_settings_link" msgid="6725453466705333311">"Definições adicionais na aplicação"</string>
     <string name="notification_screen_summary" msgid="5984915275134654822">"Histórico de notificações, balões, enviadas recentemente"</string>
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Ativadas para todas as apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
-      <item quantity="other">Desativadas para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
       <item quantity="one">Desativadas para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="other">Desativadas para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Ativado"</string>
     <string name="notification_toggle_off" msgid="3295373308338024844">"Desativadas"</string>
@@ -4078,7 +4082,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas com prioridade"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}other{# conversas}}"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}one{# conversa(s)}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -4087,7 +4091,7 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitem som, verifique se o dispositivo está definido para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas recebidas são bloqueadas no horário \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos com estrela"</string>
-    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e mais #}}"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sem nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
@@ -4097,7 +4101,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas estão bloqueadas. Pode ajustar as definições para permitir que os seus amigos, família ou outras pessoas o contactem."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Recebe todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Recebe todas as chamadas"</string>
-    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}other{# contactos}}"</string>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}one{# contacto(s)}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos com estrela"</string>
@@ -4135,13 +4139,13 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As pessoas selecionadas podem continuar a entrar em contacto consigo, mesmo que não permita que as apps interrompam."</string>
-    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}one{As apps {app_1}, {app_2} e mais # podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
@@ -4166,12 +4170,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Alterar para alarmes apenas, indefinidamente"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
-      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="one">Alterar para alarmes apenas durante um minuto até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
-      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="one">Alterar para alarmes apenas durante uma hora até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Alterar para interromper sempre"</string>
@@ -4245,20 +4249,20 @@
     <string name="app_launch_add_link" msgid="8622558044530305811">"Adicionar link"</string>
     <string name="app_launch_footer" msgid="4521865035105622557">"Uma app pode validar os links para serem abertos automaticamente na app."</string>
     <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links validados</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link validado</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links validados</item>
     </plurals>
     <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
-      <item quantity="other">Estes links são validados e abertos automaticamente nesta app.</item>
       <item quantity="one">Este link é validado e aberto automaticamente nesta app.</item>
+      <item quantity="other">Estes links são validados e abertos automaticamente nesta app.</item>
     </plurals>
     <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
     <string name="app_launch_verified_links_info_description" msgid="7514750232467132117">"Mostrar lista de links validados"</string>
     <string name="app_launch_checking_links_title" msgid="6119228853554114201">"A verificar outros links suportados…"</string>
     <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
     <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links suportados</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link suportado</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links suportados</item>
     </plurals>
     <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adicionar"</string>
     <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Abre na app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4282,20 +4286,20 @@
     <string name="notification_summary_level" msgid="4074326972839105652">"Nível %d"</string>
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias desativadas.</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria desativada.</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias desativadas.</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
-      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Nenhuma permissão solicitada"</string>
@@ -4304,8 +4308,8 @@
     <string name="permissions_usage_summary" msgid="6784310472062516454">"Mostrar as apps que utilizaram autorizações recentemente"</string>
     <string name="unused_apps" msgid="4566272194756830656">"Apps não utilizadas"</string>
     <plurals name="unused_apps_summary" formatted="false" msgid="3827583582750975783">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps não utilizadas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> app não utilizada</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps não utilizadas</item>
     </plurals>
     <string name="unused_apps_switch" msgid="419282628373205038">"Remover autorizações e libertar espaço"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Todas as apps"</string>
@@ -4331,15 +4335,15 @@
     <string name="domain_urls_summary_some" msgid="1197692164421314523">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Nenhum aplicação abre links compatíveis"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
       <item quantity="one">Uma aplicação que abre links compatíveis</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Permitir que a app abra links suportados"</string>
     <string name="app_link_open_ask" msgid="2422450109908936371">"Perguntar sempre"</string>
     <string name="app_link_open_never" msgid="5299808605386052350">"Não permitir que a app abra links"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
-      <item quantity="other">A app refere que consegue processar <xliff:g id="COUNT_1">%d</xliff:g> links.</item>
       <item quantity="one">A app refere que consegue processar <xliff:g id="COUNT_0">%d</xliff:g> link.</item>
+      <item quantity="other">A app refere que consegue processar <xliff:g id="COUNT_1">%d</xliff:g> links.</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"A app refere que consegue processar os seguintes links:"</string>
     <string name="default_apps_title" msgid="6943471331817718664">"Predefinição"</string>
@@ -4380,12 +4384,12 @@
     <string name="show_all_apps" msgid="4490719452453223082">"Mostrar utilização total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="7313907836289865123">"Mostrar utilização de apps"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
-      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
-      <item quantity="other">Aplicações a consumir rapidamente a bateria</item>
       <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> a consumir rapidamente a bateria</item>
+      <item quantity="other">Aplicações a consumir rapidamente a bateria</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Não otimizada"</string>
     <string name="high_power_on" msgid="8778058701270819268">"Não otimizada"</string>
@@ -4466,8 +4470,8 @@
     <string name="free_memory" msgid="439783742246854785">"Disponível"</string>
     <string name="memory_usage_apps" msgid="5776108502569850579">"Memória utilizada pelas aplicações"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Frequência"</string>
     <string name="memory_maximum_usage" msgid="2047013391595835607">"Utilização máxima"</string>
@@ -4544,8 +4548,8 @@
     <string name="data_usage_summary_format" msgid="6844301859713164522">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilizado em Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
-      <item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
       <item quantity="one">Desativadas para 1 aplicação</item>
+      <item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Ativadas para todas as apps"</string>
     <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> aplicações instaladas"</string>
@@ -4612,12 +4616,12 @@
     <string name="suggestions_summary" msgid="1709710458908440469">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestions_more_title" msgid="240124526378997009">"Mais <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
       <item quantity="one">1 sugestão</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
-      <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
       <item quantity="one">Mais 1 sugestão</item>
+      <item quantity="other">Mais <xliff:g id="COUNT">%1$d</xliff:g> sugestões</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Remover"</string>
     <string name="color_temperature" msgid="8256912135746305176">"Temperatura da cor fria"</string>
@@ -4645,8 +4649,8 @@
     <string name="billing_cycle_fragment_summary" msgid="6346655500491631357">"Mensalmente no dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8385824604048229846">"Restrições de rede"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
       <item quantity="one">1 restrição</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
     <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados utilizados por redes de operadores"</string>
@@ -4660,8 +4664,8 @@
     <string name="configure" msgid="1499586749829665889">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
       <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Dados principais"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Dados de Wi-Fi"</string>
@@ -4672,8 +4676,8 @@
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Gráfico que mostra a utilização de dados entre <xliff:g id="START_DATE">%1$s</xliff:g> e <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Não existem dados para este intervalo de datas."</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
-      <item quantity="other">%d dias restantes</item>
       <item quantity="one">%d dia restante</item>
+      <item quantity="other">%d dias restantes</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Sem tempo restante"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Resta menos de 1 dia."</string>
@@ -4745,8 +4749,8 @@
     <string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Falha ao aplicar a sobreposição."</string>
     <string name="special_access" msgid="1767980727423395147">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem utilizar dados sem restrições</item>
       <item quantity="one">1 app pode utilizar dados sem restrições</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem utilizar dados sem restrições</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"Veja mais"</string>
     <string name="confirm_convert_to_fbe_warning" msgid="3783325656948378111">"Pretende mesmo limpar os dados do utilizador e converter para a encriptação de ficheiros?"</string>
@@ -4785,16 +4789,16 @@
     <string name="cross_profile_calendar_title" msgid="7570277841490216947">"Calendário de vários perfis"</string>
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Mostrar eventos de trabalho no calendário pessoal"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
       <item quantity="one">1 hora</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
       <item quantity="one">1 minuto</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
       <item quantity="one">1 segundo</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gerir o armazenamento"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
@@ -4816,15 +4820,15 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"Tirar selfies mais rapidamente"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"Navegação no sistema"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navegação com 2 botões"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para mudar de aplicação, deslize rapidamente para cima no botão página inicial. Para ver todas as aplicações, volte a deslizar rapidamente para cima. Para retroceder, toque no botão Anterior."</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para mudar de app, deslize rapidamente para cima no botão página inicial. Para ver todas as apps, volte a deslizar rapidamente para cima. Para retroceder, toque no botão Anterior."</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Experimentar o novo botão página inicial"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Ativar o novo gesto para alternar entre aplicações"</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Segurança e emergência"</string>
     <string name="emergency_dashboard_summary" msgid="401033951074039302">"Urgência SOS, informações médicas, alertas"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navegação por gestos"</string>
-    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Para aceder à página inicial, deslize rapidamente para cima a partir da parte inferior do ecrã. Para mudar de aplicação, deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte. Para retroceder, deslize rapidamente a partir da extremidade esquerda ou direita do ecrã."</string>
+    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Para aceder à página inicial, deslize rapidamente para cima a partir da parte inferior do ecrã. Para mudar de app, deslize rapidamente para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte. Para retroceder, deslize rapidamente a partir da extremidade esquerda ou direita do ecrã."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"Navegação com 3 botões"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Retroceda, aceda à página inicial e mude de aplicação com os botões na parte inferior do ecrã."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Retroceda, aceda à página inicial e mude de app com os botões na parte inferior do ecrã."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"navegação no sistema, navegação com 2 botões, navegação com 3 botões, navegação por gestos, deslizar rapidamente"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"Não suportada pela sua aplicação Página inicial predefinida, <xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>."</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"Mudar de app Página inicial predef."</string>
@@ -4923,16 +4927,16 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Apps instaladas"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
-      <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
       <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autoriz. de Localização"</string>
     <string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Autorizações do microfone"</string>
     <string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Autorizações da câmara"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Apps predefinidas"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Teclado predefinido"</string>
     <string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Definido como <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -4944,16 +4948,16 @@
     <string name="enterprise_privacy_ca_certs_personal" msgid="1516422660828485795">"Credenciais fidedignas no seu perfil pessoal"</string>
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Credenciais fidedignas no seu perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
-      <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
       <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
+      <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"O gestor pode bloquear o dispositivo e repor a palavra-passe"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"O gestor pode eliminar todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Este dispositivo é gerido pela sua entidade."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
@@ -4968,19 +4972,19 @@
     <string name="financed_privacy_failed_password_wipe_device" msgid="8777230427603977667">"Tentativas de introdução da palavra-passe falhadas antes da eliminação dos dados do dispositivo"</string>
     <string name="financed_privacy_header" msgid="7215645340918406124">"O seu fornecedor de crédito pode alterar as definições e instalar software neste dispositivo.\n\nPara saber mais, contacte o seu fornecedor de crédito."</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
-      <item quantity="other">Aplicações de câmara</item>
       <item quantity="one">Aplicação de câmara</item>
+      <item quantity="other">Aplicações de câmara</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Aplicação de calendário"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Aplicação de contactos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
-      <item quantity="other">Aplicações de cliente de email</item>
       <item quantity="one">Aplicação de cliente de email</item>
+      <item quantity="other">Aplicações de cliente de email</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Aplicação de mapas"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
-      <item quantity="other">Aplicações de telefone</item>
       <item quantity="one">Aplicação de telefone</item>
+      <item quantity="other">Aplicações de telefone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -5016,8 +5020,8 @@
     <string name="autofill_app" msgid="7595308061826307921">"Preenchimento automático"</string>
     <string name="autofill_passwords" msgid="6708057251459761083">"Palavras-passe"</string>
     <plurals name="autofill_passwords_count" formatted="false" msgid="7715009165029452622">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> palavras-passe</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> palavra-passe</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> palavras-passe</item>
     </plurals>
     <string name="autofill_keywords" msgid="8598763328489346438">"automático, preenchimento, preenchimento automático, palavra-passe"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Certifique-se de que confia nesta app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
@@ -5196,8 +5200,8 @@
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Adicionar uma rede"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> SIM</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Predefinição para chamadas"</string>
     <string name="default_for_sms" msgid="1316988329407434771">"Predefinição para SMS"</string>
@@ -5290,7 +5294,7 @@
     <string name="dsds_notification_after_suw_title" msgid="3738898232310273982">"Configure o seu outro SIM"</string>
     <string name="dsds_notification_after_suw_text" msgid="1287357774676361084">"Escolha o SIM ativo ou utilize 2 SIMs em simultâneo."</string>
     <string name="choose_sim_title" msgid="4804689675237716286">"Escolha um número para utilizar"</string>
-    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{Está disponível 1 número neste dispositivo, mas apenas pode utilizar um de cada vez}=2{Estão disponíveis 2 números neste dispositivo, mas apenas pode utilizar um de cada vez}other{Estão disponíveis # números neste dispositivo, mas apenas pode utilizar um de cada vez}}"</string>
+    <string name="choose_sim_text" msgid="4356662002583501647">"{count,plural, =1{Está disponível 1 número neste dispositivo, mas apenas pode utilizar um de cada vez}=2{Estão disponíveis 2 números neste dispositivo, mas apenas pode utilizar um de cada vez}one{Está(ão) disponível(is) # número(s) neste dispositivo, mas apenas pode utilizar um de cada vez}other{Estão disponíveis # números neste dispositivo, mas apenas pode utilizar um de cada vez}}"</string>
     <string name="choose_sim_activating" msgid="9035902671985449448">"A ativar<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="choose_sim_could_not_activate" msgid="2154564459842291617">"Não foi possível ativar neste momento"</string>
     <string name="choose_sim_item_summary_unknown" msgid="7854314795485227568">"Número desconhecido"</string>
@@ -5344,13 +5348,13 @@
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"Utilização das autorizações nas últimas 24 horas"</string>
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Ver tudo no painel de controlo"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> aplicações</item>
       <item quantity="one">1 aplicação</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> aplicações</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilização da acessibilidade"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
-      <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> aplicações têm acesso total ao seu dispositivo.</item>
       <item quantity="one">1 aplicação tem acesso total ao seu dispositivo.</item>
+      <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> aplicações têm acesso total ao seu dispositivo.</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Saída do interruptor"</string>
     <string name="media_output_panel_summary_of_playing_device" msgid="6998758947764222915">"A reproduzir atualmente no dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>…"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e76fbe5..b99449e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -132,7 +132,7 @@
     <string name="bluetooth_remember_choice" msgid="173821849670438110">"Não perguntar novamente"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Não perguntar novamente"</string>
     <string name="bluetooth_map_request" msgid="8664081227240707479">"Solicitação de acesso a mensagens"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s deseja acessar suas mensagens. Permitir acesso a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"Solicitação de acesso ao chip"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos."</string>
@@ -320,7 +320,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Indisponível"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Status da segurança"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"Bloqueio de tela, Encontre Meu Dispositivo, segurança do app"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"Bloqueio de tela, Encontre Meu Dispositivo, Segurança dos apps"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"Toque para configurar o Desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="2126625155005348417">"Desbloqueio facial"</string>
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para parear com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Verifique se ele está mostrando a seguinte senha:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirme para parear com o conjunto coordenado"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Parear com este dispositivo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para parear com:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Digite no dispositivo:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>. Em seguida, pressione Voltar ou Entrar."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de chamadas"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Não foi possível conectar. Tente novamente."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalhes do dispositivo"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Endereço Bluetooth do dispositivo: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Endereço Bluetooth do dispositivo:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Esquecer dispositivo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Remover associação"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Desconectar o app?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Lembrar configurações"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Número máximo de dispositivos de áudio Bluetooth conectados"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecione o número máximo de dispositivos de áudio Bluetooth conectados"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Registro de depuração da pilha NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Aumentar o nível de registros da pilha NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmitir"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"espelho"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Ativar tela sem fio"</string>
@@ -1430,7 +1434,7 @@
     <string name="screensaver_settings_button" msgid="6159236558934930238">"Configurações"</string>
     <string name="automatic_brightness" msgid="4599827881929079513">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"Levantar para ativar"</string>
-    <string name="ambient_display_screen_title" msgid="8615947016991429325">"Visualização na tela"</string>
+    <string name="ambient_display_screen_title" msgid="8615947016991429325">"Tela ambiente"</string>
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Quando mostrar"</string>
     <string name="doze_title" msgid="1523090408230862316">"Ativar tela para notificações"</string>
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
@@ -2271,7 +2275,7 @@
     <string name="usage_time_label" msgid="9105343335151559883">"Tempo de uso"</string>
     <string name="accessibility_settings" msgid="4713215774904704682">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Configurações de acessibilidade"</string>
-    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Tela, interação, áudio"</string>
+    <string name="accessibility_settings_summary" msgid="2366627644570558503">"Exibição, interação, áudio"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Mudar o tamanho da fonte"</string>
@@ -2279,7 +2283,7 @@
     <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
     <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
     <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
-    <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
+    <string name="display_category_title" msgid="6638191682294461408">"Exibição"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
     <string name="interaction_control_category_title" msgid="2696474616743882372">"Controles de interação"</string>
@@ -2670,7 +2674,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Maior uso da bateria"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Ver apps com maior uso"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Carregamento temporariamente limitado"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Isso economiza a bateria. Saiba mais."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Para economia de bateria. Saiba mais."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Retomar o carregamento"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Em determinadas condições, como temperaturas altas ou longos períodos de carregamento, a carga pode ser limitada a <xliff:g id="PERCENT">%1$s</xliff:g> para preservar a integridade da bateria.\n\nQuando sair de uma condição assim, o smartphone voltará a ser carregado normalmente."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Em determinadas condições, como temperaturas altas ou longos períodos de carregamento, a carga pode ser limitada a <xliff:g id="PERCENT">%1$s</xliff:g> para preservar a integridade da bateria.\n\nQuando sair de uma condição assim, o tablet voltará a ser carregado normalmente."</string>
@@ -3574,7 +3578,7 @@
     <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"tema, claro, escuro, modo, sensibilidade à luz, fotofobia, escurecer, deixar mais escuro, modo escuro, enxaqueca"</string>
     <string name="keywords_systemui_theme" msgid="6341194275296707801">"tema escuro"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"bug"</string>
-    <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Exibição ambiente, exibição de tela de bloqueio"</string>
+    <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Tela ambiente, exibição na tela de bloqueio"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"notificação de tela de bloqueio, notificações"</string>
     <string name="keywords_face_settings" msgid="1360447094486865058">"rosto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impressão digital, adicionar impressão digital"</string>
@@ -3757,7 +3761,7 @@
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"Gerenciar"</string>
-    <string name="app_notification_field" msgid="3858667320444612716">"Configurações do app"</string>
+    <string name="app_notification_field" msgid="3858667320444612716">"Configurações de apps"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"Controlar as notificações de apps individuais"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
@@ -3781,7 +3785,7 @@
     <string name="history_toggled_on_summary" msgid="9034278971358282728">"As notificações recentes e adiadas aparecerão aqui"</string>
     <string name="notification_history_view_settings" msgid="5269317798670449002">"ver configurações de notificação"</string>
     <string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificação"</string>
-    <string name="snooze_options_title" msgid="2109795569568344617">"Permitir soneca para notificações"</string>
+    <string name="snooze_options_title" msgid="2109795569568344617">"Permitir adiar notificações"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Ocultar ícones das notificações discretas"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Os ícones de notificações discretas não são exibidos na barra de status"</string>
     <string name="notification_badging_title" msgid="5469616894819568917">"Ponto de notificação no ícone do app"</string>
@@ -3912,7 +3916,7 @@
       <item quantity="other">Cerca de <xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do app e do dispositivo"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações de apps e do dispositivo"</string>
     <string name="manage_notification_access_summary" msgid="2907135226478903997">"Controlar quais apps e dispositivos podem ler as notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Os apps não podem ler notificações"</string>
@@ -3920,13 +3924,13 @@
       <item quantity="one">%d apps podem ler notificações</item>
       <item quantity="other">%d apps podem ler notificações</item>
     </plurals>
-    <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações aprimoradas"</string>
+    <string name="notification_assistant_title" msgid="5889201903272393099">"Notificações avançadas"</string>
     <string name="notification_assistant_summary" msgid="1957783114840908887">"Receber sugestões de ações, respostas e muito mais"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Nenhuma"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Nenhum app instalado solicitou o acesso a notificações."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Permitir acesso às notificações"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Permitir que o app <xliff:g id="SERVICE">%1$s</xliff:g> acesse as notificações?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"No Android 12, as notificações aprimoradas substituíram as notificações adaptáveis. Esse recurso exibe ações e respostas sugeridas, além de organizar suas notificações. \n\nAs notificações aprimoradas podem acessar o conteúdo das notificações, incluindo informações pessoais como nomes de contatos e mensagens. Elas também podem dispensar ou responder às notificações, como atender chamadas telefônicas e controlar o Não perturbe."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"No Android 12, as notificações avançadas substituíram as notificações adaptáveis. Esse recurso exibe ações e respostas sugeridas, além de organizar suas notificações. \n\nAs notificações avançadas podem acessar o conteúdo das notificações, incluindo informações pessoais como nomes de contatos e mensagens. Elas também podem dispensar ou responder às notificações, como atender chamadas telefônicas e controlar o Não perturbe."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Permitir que <xliff:g id="SERVICE">%1$s</xliff:g> acesse as notificações?"</string>
     <string name="notification_listener_security_warning_summary" msgid="3668606006326629153">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. O app também poderá adiar ou dispensar notificações ou acionar botões que elas contenham, incluindo atender chamadas telefônicas. \n\nIsso também autoriza o app a ativar ou desativar o modo Não perturbe e mudar as configurações relacionadas."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Se você desativar o acesso a notificações para <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, é possível que o acesso ao Não perturbe também seja desativado."</string>
@@ -5441,7 +5445,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
-    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e se conectar a elas"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e conectar"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="3788238090898237767">"Chamada no Wi-Fi"</string>
@@ -5494,10 +5498,10 @@
     <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
     <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
     <string name="bluetooth_message_access_notification_content" msgid="5111712860712823893">"Um dispositivo quer acessar suas mensagens. Toque para ver detalhes."</string>
-    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Permitir acesso às mensagens?"</string>
     <string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"Um dispositivo Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quer acessar suas mensagens.\n\nVocê nunca se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="bluetooth_phonebook_access_notification_content" msgid="9175220052703433637">"Um dispositivo quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
-    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Permitir acesso aos contatos e ao registro de chamadas?"</string>
     <string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"Um dispositivo Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê nunca se conectou a <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
     <string name="category_name_brightness" msgid="8520372392029305084">"Brilho"</string>
     <string name="category_name_lock_display" msgid="8310402558217129670">"Tela de bloqueio"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5b8dc3b..093aee7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -844,6 +844,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ar putea fi necesar, de asemenea, să introduceți acest cod PIN pe celălalt dispozitiv."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Ar putea fi necesar, de asemenea, să introduceți această parolă pe celălalt dispozitiv."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Pentru asocierea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;asigurați-vă că se afișează această cheie de acces:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Confirmați pentru a asocia cu setul coordonat"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"De la:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Asociați cu acest dispozitiv?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Pentru împerecherea cu:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Introduceți pe acesta:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, apoi apăsați tasta Return sau Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permiteți accesul la agendă și la istoricul apelurilor"</string>
@@ -877,6 +878,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nu s-a putut conecta. Încercați din nou."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detalii despre dispozitiv"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth a dispozitivului: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa Bluetooth a dispozitivului: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Eliminați dispozitivul?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Eliminați asocierea"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Deconectați aplicația?"</string>
@@ -909,6 +911,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Rețineți setările"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numărul maxim de dispozitive audio Bluetooth conectate"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selectați numărul maxim de dispozitive audio Bluetooth conectate"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Jurnalul de remediere a erorilor pentru stiva NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Măriți nivelul de înregistrare pentru stiva NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Proiectare"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"oglindă"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Activați ecranul wireless"</string>
@@ -4372,7 +4376,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de aplicații nefolosite</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicație nefolosită</item>
     </plurals>
-    <string name="unused_apps_switch" msgid="419282628373205038">"Eliminați permisiuni și eliberați spațiu"</string>
+    <string name="unused_apps_switch" msgid="419282628373205038">"Revocă permisiunile și eliberează spațiu"</string>
     <string name="filter_all_apps" msgid="6645539744080251371">"Toate aplicațiile"</string>
     <string name="filter_enabled_apps" msgid="8868356616126759124">"Aplicații instalate"</string>
     <string name="filter_instant_apps" msgid="2292108467020380068">"Aplicații instantanee"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7b3212b..5937d5d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -859,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Возможно, потребуется ввести PIN-код на другом устройстве."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Возможно, потребуется ввести ключ доступа на другом устройстве."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Для подключения к устройству&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;на нем должен отображаться этот код доступа:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Подтвердите, чтобы подключиться к координированному набору."</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Запрос от: &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Подключиться к этому устройству?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Для подключения к устройству <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> введите на нем код <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затем нажмите клавишу Return или Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешить доступ к контактам и журналу звонков"</string>
@@ -892,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ошибка подключения. Повторите попытку."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Об устройстве"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адрес Bluetooth этого устройства: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адрес Bluetooth этого устройства: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Удалить устройство?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Удалить связь"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Отключить приложение?"</string>
@@ -924,6 +926,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запомнить настройки"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимальное количество подключенных Bluetooth-аудиоустройств"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Укажите максимальное количество подключенных Bluetooth-аудиоустройств"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал отладки стека NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Ведение подробного журнала стека NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляция"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дублирование"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Включить"</string>
@@ -3755,7 +3759,7 @@
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Отключить звук"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Уведомления будут показываться на экране"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="2152115038156049608">"Уведомления будут приходить без звука и вибрации."</string>
-    <string name="zen_mode_restrict_notifications_hide" msgid="5997930361607752541">"Полностью отключить"</string>
+    <string name="zen_mode_restrict_notifications_hide" msgid="5997930361607752541">"Отключить звук и отображение уведомлений"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="6005445725686969583">"Уведомления будут полностью отключены"</string>
     <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"Уведомления будут скрыты, а при их получении телефон не будет вибрировать или издавать звуковой сигнал. Важные системные уведомления все равно будут появляться.\n\nЧтобы посмотреть скрытые уведомления после отключения режима \"Не беспокоить\", проведите по экрану сверху вниз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="5469078057954463796">"Специальные настройки"</string>
@@ -3763,7 +3767,7 @@
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="5062332754972217218">"Отключить специальные настройки"</string>
     <string name="zen_mode_restrict_notifications_summary_muted" msgid="4750213316794189968">"Отключить звук уведомлений"</string>
     <string name="zen_mode_restrict_notifications_summary_custom" msgid="3918461289557316364">"Скрывать частично"</string>
-    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="636494600775773296">"Полностью отключить уведомления"</string>
+    <string name="zen_mode_restrict_notifications_summary_hidden" msgid="636494600775773296">"Отключить звук и отображение уведомлений"</string>
     <string name="zen_mode_what_to_block_title" msgid="5692710098205334164">"Специальные ограничения"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="8780668375194500987">"При включенном экране"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="2291988790355612826">"При отключенном экране"</string>
@@ -3820,7 +3824,7 @@
     <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука (за исключением тех, для которых вы задали разрешения выше). Вы можете изменить настройки, чтобы сообщения от членов семьи, друзей и других контактов приходили со звуком."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"ОК"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Настройки"</string>
-    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Полностью отключить уведомления"</string>
+    <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Отключить звук и отображение уведомлений"</string>
     <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Отключить звук уведомлений"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Уведомления будут полностью отключены. Вы сможете получать звонки только от помеченных контактов и от людей, звонящих повторно."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(выбрано)"</string>
@@ -3845,7 +3849,7 @@
     <string name="recent_notifications" msgid="1105631022180160436">"Недавние уведомления"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Смотреть все за последние 7 дней"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"Управление"</string>
-    <string name="app_notification_field" msgid="3858667320444612716">"Настройки приложения"</string>
+    <string name="app_notification_field" msgid="3858667320444612716">"Настройки приложений"</string>
     <string name="app_notification_field_summary" msgid="5981393613897713471">"Управление уведомлениями отдельных приложений"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"Общие"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Рабочие уведомления"</string>
@@ -4007,7 +4011,7 @@
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Никогда"</string>
     <string name="manage_notification_access_title" msgid="6481256069087219982">"Уведомления на устройствах и в приложениях"</string>
-    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Укажите, какие приложения могут просматривать уведомления"</string>
+    <string name="manage_notification_access_summary" msgid="2907135226478903997">"Выбрать приложения и устройства, у которых есть доступ к уведомлениям"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Доступ к уведомлениям в рабочем профиле заблокирован"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Приложения не могут просматривать уведомления"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d005bdf..cd36e32 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"ඔබට මෙම PIN එක අනෙක් උපාංගයේ ටයිප් කිරීමට සිදුවනු ඇත."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"ඔබට මෙම මුරයතුර අනෙක් උපාංගයේ ටයිප් කිරීමට සිදුවනු ඇත."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;සමග යුගල කිරීමට&lt;br&gt;එය මෙම මුර යතුර පෙන්වන්නේදැයි තහවුරු කර ගන්න:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"සම්බන්ධීකරණය කළ කට්ටලය සමඟ යුගල කිරීම තහවුරු කරන්න"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"වෙතින්:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;මෙම උපාංගය සමඟ යුගල කරන්නද?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>: සමඟ යුගල කිරීමට එය මත <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>: ටයිප් කරන්න, ඉන්පසු Return හෝ Enter ඔබන්න."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ඔබගේ සම්බන්ධතා සහ ඇමතුම් ඉතිහාසය වෙත ප්‍රවේශ විමට ඉඩ දෙන්න"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"සම්බන්ධ වීමට නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
     <string name="device_details_title" msgid="1155622417516195481">"උපාංග විස්තර"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"උපාංගයේ බ්ලූටූත් ලිපිනය: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"උපාංගයේ බ්ලූටූත් ලිපිනය:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"උපාංගය අමතකද?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"සම්බන්ධය ඉවත් කරන්න"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"යෙදුම විසන්ධි කරන්නද?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"සැකසීම් මතක තබාගන්න"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"උපරිම සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"සම්බන්ධිත බ්ලූටූත් ශ්‍රව්‍ය උපාංග උපරිම ගණන තෝරන්න"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC අට්ටි නිදොසීම් ලොගය"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC අට්ටි ලොග මට්ටම වැඩි කරන්න"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"දර්පණය"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"රැහැන් රහිත දර්ශනය සබල කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0dec38a..580da35 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -861,6 +861,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Tento kód PIN bude možno treba zadať aj na druhom zariadení."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Tento prístupový kľúč možno bude potrebné zadať aj v druhom zariadení."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Párovanie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Uistite sa, že zobrazuje tento prístupový kľúč:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potvrďte párovanie s koordinovanou skupinou"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Zo zariadenia:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Párovať s týmto zariadením?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Ak chcete svoje zariadenie spárovať so zariadením <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>, zadajte na ňom kód <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> a stlačte kláves Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povoliť prístup ku kontaktom a histórii hovorov"</string>
@@ -894,6 +895,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nepodarilo sa pripojiť. Skúste to znova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"O zariadení"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa Bluetooth zariadenia: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa zariadenia Bluetooth:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Zabudnúť zariadenie?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstrániť spojenie"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Chcete aplikáciu odpojiť?"</string>
@@ -926,6 +928,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapamätať nastavenia"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximálny počet pripojených zvukových zariadení Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Výber maximálneho počtu pripojených zvukových zariadení Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Denník ladenia zásobníka NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Zvýšiť úroveň zapisovania zásobníka NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Prenos"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrkadlenie"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Povoliť bezdrôtové zobrazenie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0751036..b635bd3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -861,6 +861,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ta PIN boste morda morali vnesti tudi v drugi napravi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Geslo boste morda morali vnesti tudi v drugi napravi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Če želite seznaniti z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Prikazano mora biti to geslo:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Potrdite seznanjanje s kompletom naprav"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Od:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ali se želite povezati s to napravo?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Če želite vzpostaviti povezavo z napravo:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>V njej vnesite:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> in pritisnite Return ali Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dovoli dostop do stikov in zgodovine klicev"</string>
@@ -894,6 +895,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Povezave ni bilo mogoče vzpostaviti. Poskusite znova."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Podrobnosti o napravi"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Naslov Bluetooth naprave: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Naslov Bluetooth naprave:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Želite, da vaša naprava pozabi seznanjeno napravo?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Odstrani povezavo"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Želite prekiniti povezavo z aplikacijo?"</string>
@@ -926,6 +928,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Zapomni si nastavitve"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Izberite največje dovoljeno število povezanih zvočnih naprav Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Dnevnik odpravljanja napak sklada NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Povečaj raven zapisovanja dnevnika za sklad NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Predvajanje"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"zrcaljenje"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Omogočanje brezžičnega zaslona"</string>
@@ -2732,7 +2736,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Višja poraba energije baterije"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Ogled aplikacij z najvišjo porabo energije"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Začasno omejeno polnjenje"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Da se bo energija baterija počasneje porabljala. Več o tem"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Za ohranjanje baterije. Več o tem"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Nadaljuj polnjenje"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"V nekaterih pogojih, na primer pri visokih temperaturah ali daljšem polnjenju, bo polnjenje morda omejeno na <xliff:g id="PERCENT">%1$s</xliff:g> za ohranjanje ustreznega stanja baterije.\n\nKo teh pogojev ni več, polnjenje baterije telefona samodejno zopet poteka kot običajno."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"V nekaterih pogojih, na primer pri visokih temperaturah ali daljšem polnjenju, bo polnjenje morda omejeno na <xliff:g id="PERCENT">%1$s</xliff:g> za ohranjanje ustreznega stanja baterije.\n\nKo teh pogojev ni več, polnjenje baterije tabličnega računalnika samodejno zopet poteka kot običajno."</string>
@@ -3887,7 +3891,7 @@
     <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"Če vklopite oblačke za to aplikacijo, bodo vklopljeni tudi za napravo.\n\nTo vpliva na druge aplikacije ali pogovore, v katerih je prikaz v oblačkih že omogočen."</string>
     <string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"Vklopi"</string>
     <string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"Prekliči"</string>
-    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Vklopljeno/pogovori so lahko prikazani kot lebdeče ikone"</string>
+    <string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Vklopljeno/pogovori so lahko prikazani kot lebdeče ikone."</string>
     <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Omogoči aplikacijam, da prikažejo oblačke"</string>
     <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Nekateri pogovori bodo prikazani kot lebdeče ikone nad drugimi aplikacijami."</string>
     <string name="bubble_app_setting_all" msgid="312524752846978277">"Vsi pogovori so lahko prikazani v oblačkih"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 9e32889..2cd26fc 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Mund të duhet gjithashtu ta shkruash këtë kod PIN në pajisjen tjetër."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Mund të duhet gjithashtu ta shkruash këtë çelës kalimi në pajisjen tjetër."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Për ta çiftuar me:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;sigurohu që të tregojë këtë çelës kalimi:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Konfirmo për të çiftuar me grupin e koordinuar"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Nga:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Të çiftohet me këtë pajisje?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Për ta çiftuar me:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Shkruaj në të:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> dhe më pas shtyp Kthehu ose Hyr."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Lejo qasjen te kontaktet dhe historiku i telefonatave"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Nuk mund të lidhej. Provo përsëri."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Detajet e pajisjes"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Adresa e Bluetooth-it e pajisjes: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresa e Bluetooth-it e pajisjes:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Të harrohet pajisja?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hiq lidhjen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Të shkëputet aplikacioni?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kujto cilësimet"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Numri maksimal i pajisjeve të lidhura audio me Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Zgjidh numrin maksimal të pajisjeve të lidhura audio me Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Evidenca e korrigjimit të grumbullit të NFC-së"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Rrit nivelin e regjistrimit të grumbullit të NFC-së"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Transmetimi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"pasqyro"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivizo ekranin pa tel"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Karikimi përkohësisht i kufizuar"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Për të kursyer baterinë. Mëso më shumë."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Vazhdo karikimin"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Në kushte të caktuara, si p.sh. në temperatura të larta dhe periudha të gjata, karikimi mund të kufizohet në <xliff:g id="PERCENT">%1$s</xliff:g> për të ndihmuar në ruajtjen e gjendjes së baterisë.\n\nKur këto kushte përfundojnë, telefoni yt do të karikohet automatikisht si zakonisht."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Në kushte të caktuara, si p.sh. në temperatura të larta dhe periudha të gjata, karikimi mund të kufizohet në <xliff:g id="PERCENT">%1$s</xliff:g> për të ndihmuar në ruajtjen e gjendjes së baterisë.\n\nKur këto kushte përfundojnë, telefoni yt do të karikohet automatikisht si zakonisht."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Karikimi mund të kufizohet në <xliff:g id="PERCENT">%1$s</xliff:g> për të ndihmuar në ruajtjen e gjendjes së baterisë në kushte të caktuara, si p.sh. në temperatura të larta dhe periudha të gjata karikimi.\n\nKur këto kushte përfundojnë, telefoni yt do të karikohet automatikisht si zakonisht."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Karikimi mund të kufizohet në <xliff:g id="PERCENT">%1$s</xliff:g> për të ndihmuar në ruajtjen e gjendjes së baterisë në kushte të caktuara, si p.sh. në temperatura të larta dhe periudha të gjata karikimi.\n\nKur këto kushte përfundojnë, tableta jote do të karikohet automatikisht si zakonisht."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Bateria mund të mbarojë më shpejt se normalisht pasi e ke përdorur telefonin më shumë se zakonisht.\n\nAplikacionet që përdorin më shumë baterinë:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Bateria mund të mbarojë më shpejt se normalisht pasi e ke përdorur tabletin më shumë se zakonisht.\n\nAplikacionet që përdorin më shumë baterinë:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Bateria mund të mbarojë më shpejt se normalisht pasi e ke përdorur pajisjen më shumë se zakonisht.\n\nAplikacionet që përdorin më shumë baterinë:"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b79cc59..81637b2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -842,6 +842,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Можда ће бити потребно да унесете овај PIN и на другом уређају."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Можда ће бити потребно да унесете овај приступни кôд и на другом уређају."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Да бисте се упарили са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Уверите се да приказује овај приступни кôд:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Потврдите ради упаривања са координисаним скупом"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Са уређаја:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Желите ли да се упарите са тим уређајем?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"За упаривање са уређајем:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Унесите на њему:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а затим притисните Return или Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволи приступ контактима и историји позива"</string>
@@ -875,6 +876,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Повезивање није успело. Покушајте поново."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Детаљи о уређају"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth адреса уређаја: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Bluetooth адреса уређаја:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Желите ли да заборавите уређај?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Уклони повезивање"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Желите да прекинете везу са апликацијом?"</string>
@@ -907,6 +909,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запамти подешавања"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максималан број повезаних Bluetooth аудио уређаја"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Изаберите максимални број повезаних Bluetooth аудио уређаја"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Евиденција отклањања грешака за NFC групу"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Повећајте ниво евиденције за NFC групу"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Пребацивање"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"пресликати"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Омогући бежични приказ"</string>
@@ -2699,7 +2703,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Највећа потрошња батерије"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Погледајте апликације са највећом потрошњом батерије"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Пуњење је привремено ограничено"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"За уштеду батерије. Сазнајте више."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Да би се сачувала батерија. Сазнајте више."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Настави са пуњењем"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"У одређеним условима, на пример, високе температуре и дуги периоди пуњења, пуњење може да буде ограничено на <xliff:g id="PERCENT">%1$s</xliff:g> ради бољег стања батерије.\n\nКада ти услови престану, телефон ће аутоматски почети нормално да се пуни."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"У одређеним условима, на пример, високе температуре и дуги периоди пуњења, пуњење може да буде ограничено на <xliff:g id="PERCENT">%1$s</xliff:g> ради бољег стања батерије.\n\nКада ти услови престану, таблет ће аутоматски почети нормално да се пуни."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 26deb01..52dc6c0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Du kan också behöva ange PIN-koden på den andra enheten."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Du kan också behöva ange lösenordet på den andra enheten."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Om du vill koppla med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt; måste lösenordet &lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt; visas i den"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Bekräfta för att parkoppla med koordinerat set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Från:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vill du koppla den till enheten?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Koppla till:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Skriv:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> och tryck sedan på Retur."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Tillåt åtkomst till kontakter och sökhistorik"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Det gick inte att ansluta. Försök igen."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Enhetsinformation"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Enhetens Bluetooth-adress: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Enhetens Bluetooth-adress:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Vill du glömma enheten?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ta bort kopplingen"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Vill du koppla från appen?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kom ihåg inställningarna"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maxantal för ljudenheter anslutna via Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Välj ett maxantal för ljudenheter anslutna via Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Felsökningslogg för NFC-stack"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Öka loggningsnivå för NFC-stack"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Casta"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"spegling"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Aktivera wifi-skärmdelning"</string>
@@ -976,7 +980,7 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Använd mobildata när wifi-nätverket inte är anslutet till internet. Avgifter för dataanvändning kan tillkomma."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Lägg till nätverk"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Inställningar för wifi"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wi‑Fi återaktiveras automatiskt"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wifi återaktiveras automatiskt"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"Wi‑Fi återaktiveras inte automatiskt"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"Wifi-nätverk"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"Fler alternativ"</string>
@@ -2668,7 +2672,7 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Högre batteriförbrukning"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Se appar med högst batteriförbrukning"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Laddning har begränsats tillfälligt"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"För att spara batteri. Läs mer."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Detta bevarar batteriets livslängd. Läs mer."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Återuppta laddning"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Under vissa omständigheter, till exempel vid höga temperaturer och långa laddningsperioder, kan laddningen begränsas till <xliff:g id="PERCENT">%1$s</xliff:g> för att bevara batteriets livslängd.\n\nTelefonen återgår automatiskt till normal laddning när det är möjligt."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Under vissa omständigheter, till exempel vid höga temperaturer och långa laddningsperioder, kan laddningen begränsas till <xliff:g id="PERCENT">%1$s</xliff:g> för att bevara batteriets livslängd.\n\nSurfplattan återgår automatiskt till normal laddning när det är möjligt."</string>
@@ -3968,7 +3972,7 @@
     <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"Koppla dessa appar"</string>
     <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"Kopplade appar har samma behörighet och kan använda varandras data."</string>
     <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"Koppla bara appar om du litar på att de inte delar personuppgifter med IT-administratören."</string>
-    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"Du kan när som helst koppla från appar i dina sekretessinställningar för enheten."</string>
+    <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"Du kan när som helst koppla från appar i dina integritetsinställningar för enheten."</string>
     <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"Ska jobbappen <xliff:g id="NAME">%1$s</xliff:g> vara betrodd att använda personlig data?"</string>
     <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"Koppla bara appar om du litar på att de inte delar personuppgifter med IT-administratören."</string>
     <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"Appdata"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7489038..35b09b1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Unawezahitaji pia kucharaza PIN hii kwenye kifaa kingine."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Unaweza pia kuhitaji kucharaza nenosiri hili kwenye kifaa kingine."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Ili kuoanisha na :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;hakikisha inaonyesha nenosiri hili:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Thibitisha ili uoanishe na seti inayolengwa"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"From:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Llinganisha na kifaa hiki?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Kulinganisha na: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="DEVICE_NAME">%1$s</xliff:g> <xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Andika: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g> <xliff:g id="PASSKEY">%2$s</xliff:g> <xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, kisha bonyeza Rejea au Ingiza."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Ruhusu ufikiaji wa anwani na historia ya simu ulizopiga"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Imeshindwa kuunganisha. Jaribu tena."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Maelezo ya kifaa"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Anwani ya Bluetooth ya kifaa chako: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Anwani ya Bluetooth ya kifaa:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Ungependa kusahau kifaa?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Ondoa uhusiano"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ungependa kutenganisha programu?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Kumbuka mipangilio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Chagua kima cha juu zaidi cha vifaa vya sauti vya Bluetooth vilivyounganishwa"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Kumbukumbu ya utatuzi wa rafu za NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Ongeza kiwango cha kuweka kumbukumbu ya rafu za NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Tuma"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"kioo"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Washa kuonyesha skrini bila kutumia waya"</string>
@@ -2668,10 +2672,10 @@
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Matumizi ya betri ya kiwango cha juu"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Angalia programu zinazotumia betri zaidi"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Kuchaji kumedhibitiwa kwa muda"</string>
-    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Ili kuokoa betri yako. Pata maelezo zaidi."</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Ili kudumisha betri yako. Pata maelezo zaidi."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Endelea kuchaji"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Katika hali fulani, kama vile halijoto za kiwango cha juu na vipindi virefu vya kuchaji, huenda isichaji zaidi ya<xliff:g id="PERCENT">%1$s</xliff:g> ili kusaidia kuboresha muda wa matumizi ya betri. \n\nHali hizo zitakapoisha, simu yako itachaji kiotomatiki kwa njia ya kawaida."</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Katika hali fulani, kama vile halijoto za kiwango cha juu na vipindi virefu vya kuchaji, huenda isichaji zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g> ili kusaidia kuboresha muda wa matumizi ya betri. \n\nHali hizo zitakapoisha, kompyuta yako kibao itachaji kiotomatiki kwa njia ya kawaida."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Katika hali fulani, kama vile halijoto za kiwango cha juu na vipindi virefu vya kuchaji, huenda isichaji zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g> ili kusaidia kudumisha muda wa matumizi ya betri. \n\nHali hizo zitakapoisha, simu yako itachaji kiotomatiki kwa njia ya kawaida."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Katika hali fulani, kama vile halijoto za kiwango cha juu na vipindi virefu vya kuchaji, huenda isichaji zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g> ili kusaidia kudumisha muda wa matumizi ya betri. \n\nHali hizo zitakapoisha, kompyuta yako kibao itachaji kiotomatiki kwa njia ya kawaida."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Kwa kuwa umetumia simu yako kuliko kawaida, huenda chaji ya betri yako ikaisha haraka kuliko kawaida.\n\nProgramu zinazotumia betri zaidi:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Kwa kuwa umetumia kompyuta yako kibao kuliko kawaida, huenda chaji ya betri yako ikaisha haraka kuliko kawaida.\n\nProgramu zinazotumia betri zaidi:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Kwa kuwa umetumia kifaa chako kuliko kawaida, huenda chaji ya betri yako ikaisha haraka kuliko kawaida.\n\nProgramu zinazotumia betri zaidi:"</string>
@@ -3825,7 +3829,7 @@
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrini iliyofungwa, Kufunga skrini, Ruka, Kwepa"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Wakati umefunga wasifu wa kazini"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Arifa kwenye skrini iliyofungwa"</string>
-    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Onyesha mazungumzo, chaguomsingi na zisizo na sauti"</string>
+    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Onyesha mazungumzo, arifa chaguomsingi na zisizo na sauti"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ficha mazungumzo na arifa zisizo na sauti"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Usionyeshe arifa zozote"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Arifa nyeti"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a2800eb..66e089e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"பின்னை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"நீங்கள் இந்தக் கடவுச்சொல்லை வேறொரு சாதனத்திலும் உள்ளிட வேண்டியிருக்கலாம்."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"பின்வருவதுடன் இணைக்கவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இது, இந்தக் கடவுச்சொல்லைக் காட்டுகிறது என்பதை உறுதிப்படுத்தவும்:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ஒருங்கிணைக்கப்பட்ட தொகுப்பில் உள்ள சாதனங்களுடன் இணைப்பதை உறுதிசெய்துகொள்ளுங்கள்"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"பின்வருவதில் இருந்து:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;இந்தச் சாதனத்தை இணைக்கவா?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"இதனுடன் இணைக்க:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>இதை உள்ளிடவும்:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, Return அல்லது Enter ஐ அழுத்தவும்."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"உங்கள் தொடர்புகள் மற்றும் அழைப்புப் பதிவை அணுக அனுமதிக்கவும்"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"இணைக்க முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="device_details_title" msgid="1155622417516195481">"சாதன விவரங்கள்"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"சாதனத்தின் புளூடூத் முகவரி:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"சாதனத்தை அகற்றவா?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"இணைப்பை அகற்றும்"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ஆப்ஸைத் துண்டிக்கவா?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"அமைப்புகளை நினைவில்கொள்"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கை"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"இணைத்துள்ள புளூடூத் ஆடியோ சாதனங்களின் அதிகபட்ச எண்ணிக்கையைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC அடுக்கின் பிழைதிருத்த பதிவு"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC அடுக்கின் நுழைவு அளவை அதிகரிக்கும்"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"பிரதிபலித்தல்"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"வயர்லெஸ் காட்சியை இயக்கு"</string>
@@ -2314,7 +2318,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"திரையில் பெரிதாக்குவதை இயக்கும்"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"அளவை மாற்ற, 3 முறை தட்டவும்"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"திரையைப் பெரிதாக்க, பட்டனைத் தட்டவும்"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"திரையில் தெரிவதைப் பெரிதாகப் பார்க்க திரையை உடனடியாகப் பெரிதாக்கவும்.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;பெரிதாக்க:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. பெரிதாக்கலைத் தொடங்க இந்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt; {1,number,integer}. திரையைத் தட்டவும்&lt;br/&gt; {2,number,integer}. திரையில் எங்கேனும் செல்ல 2 விரல்களால் இழுக்கவும்&lt;br/&gt; {3,number,integer}. அளவை மாற்ற 2 விரல்களால் பின்ச் செய்யவும்&lt;br/&gt; {4,number,integer}. பெரிதாக்கலை நிறுத்த இந்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt;&lt;br/&gt; &lt;b&gt;தற்காலிகமாகப் பெரிதாக்க:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. பெரிதாக்கலைத் தொடங்க இந்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt; {1,number,integer}. திரையில் எங்காவது தொட்டுப் பிடித்திருக்கவும்&lt;br/&gt; {2,number,integer}. திரையில் எங்கேனும் செல்ல விரலால் இழுக்கவும்&lt;br/&gt; {3,number,integer}. பெரிதாக்கலை நிறுத்த விரலைத் திரையிலிருந்து எடுக்கவும்"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2527664482392097865">"திரையில் தெரிவதைப் பெரிதாகப் பார்க்க திரையை உடனடியாகப் பெரிதாக்கும்.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;பெரிதாக்க:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. பெரிதாக்கலைத் தொடங்க இந்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt; {1,number,integer}. திரையைத் தட்டவும்&lt;br/&gt; {2,number,integer}. திரையில் எங்கேனும் செல்ல 2 விரல்களால் இழுக்கவும்&lt;br/&gt; {3,number,integer}. அளவை மாற்ற 2 விரல்களால் பின்ச் செய்யவும்&lt;br/&gt; {4,number,integer}. பெரிதாக்கலை நிறுத்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt;&lt;br/&gt; &lt;b&gt;தற்காலிகமாகப் பெரிதாக்க:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. பெரிதாக்கலைத் தொடங்க இந்த ஷார்ட்கட்டைப் பயன்படுத்தவும்&lt;br/&gt; {1,number,integer}. திரையில் எங்காவது தொட்டுப் பிடித்திருக்கவும்&lt;br/&gt; {2,number,integer}. திரையில் எங்கேனும் செல்ல விரலால் இழுக்கவும்&lt;br/&gt; {3,number,integer}. பெரிதாக்கலை நிறுத்த விரலைத் திரையிலிருந்து எடுக்கவும்"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"’பெரிதாக்கல்’ அம்சம் ஆன் செய்யப்பட்டுள்ளபோது திரையைப் பெரிதாக்கிப் பார்க்கலாம்.\n\n"<b>"அதற்கு "</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய இரண்டு அல்லது மேற்பட்ட விரல்களில் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற இரண்டு அல்லது மேற்பட்ட விரல்களில் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தொட்டுப் பிடிக்கவும்.\n"<ul><li>"திரையில் எங்கு வேண்டுமானாலும் செல்ல இழுக்கவும்"</li>\n<li>"சிறிதாக்க விரல்களால் பின்ச் செய்து மேலே இழுக்கவும்"</li></ul>\n\n"கீபோர்டிலோ வழிசெலுத்தல் பட்டியையோ பெரிதாக்க இயலாது."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"பக்கம் <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"திறக்க அணுகல்தன்மை பட்டனைப் பயன்படுத்துதல்"</string>
@@ -4424,7 +4428,7 @@
     <string name="usb_default_label" msgid="3372838450371060750">"இயல்பு USB உள்ளமைவு"</string>
     <string name="usb_default_info" msgid="167172599497085266">"மற்றொரு சாதனம் இணைக்கப்பட்டு, உங்கள் மொபைலின் லாக் ஸ்கிரீன் திறந்திருந்தால், இந்த அமைப்புகள் பயன்படுத்தப்படும். நம்பகமான சாதனங்களுடன் மட்டும் இணைக்கவும்."</string>
     <string name="usb_power_title" msgid="5602112548385798646">"பவர் விருப்பங்கள்"</string>
-    <string name="usb_file_transfer_title" msgid="2261577861371481478">"கோப்புப் பரிமாற்றம் தொடர்பான விருப்பங்கள்"</string>
+    <string name="usb_file_transfer_title" msgid="2261577861371481478">"ஃபைல் பரிமாற்றம் தொடர்பான விருப்பங்கள்"</string>
     <string name="usb_pref" msgid="8521832005703261700">"USB"</string>
     <string name="usb_preference" msgid="5084550082591493765">"USB விருப்பத்தேர்வுகள்"</string>
     <string name="usb_control_title" msgid="1946791559052157693">"USBயை இதன்மூலம் கட்டுப்படுத்து:"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 4cb9b50..e264c25 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -276,7 +276,7 @@
     <item msgid="317746827951691657">"టోస్ట్‌ను చూపడం"</item>
     <item msgid="5679422988212309779">"మీడియాను ప్రొజెక్ట్ చేయడం"</item>
     <item msgid="6454031639780101439">"VPNని సక్రియం చేయడం"</item>
-    <item msgid="2441327072846850561">"వాల్‌పేపర్ వ్రాయడం"</item>
+    <item msgid="2441327072846850561">"వాల్‌పేపర్ రాయడం"</item>
     <item msgid="2162456889277589861">"నిర్మాణంలో సహాయం"</item>
     <item msgid="4644645617399271070">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
     <item msgid="8321845997769724385">"ఫోన్ స్థితిని చదవడం"</item>
@@ -288,7 +288,7 @@
     <item msgid="8163066895749904470">"సెల్ ప్రసారాలను చదవడం"</item>
     <item msgid="7621394050624063528">"డమ్మీ లొకేషన్"</item>
     <item msgid="37519917674959757">"నిల్వను చదవడం"</item>
-    <item msgid="3868809525697401379">"నిల్వలో వ్రాయడం"</item>
+    <item msgid="3868809525697401379">"నిల్వలో రాయడం"</item>
     <item msgid="2504191192460059817">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="7905819538788103556">"ఖాతాలను పొందడం"</item>
     <item msgid="1675025662248079254">"నేపథ్యంలో అమలు చేయడం"</item>
@@ -343,7 +343,7 @@
     <item msgid="4000577305179914546">"టోస్ట్‌ను చూపడం"</item>
     <item msgid="8660207174515570558">"మీడియాని ప్రొజెక్ట్ చేయడం"</item>
     <item msgid="3904996949561946108">"VPNని సక్రియం చేయడం"</item>
-    <item msgid="504052124101832515">"వాల్‌పేపర్‌ను వ్రాయడం"</item>
+    <item msgid="504052124101832515">"వాల్‌పేపర్‌ను రాయడం"</item>
     <item msgid="1657182386933187909">"నిర్మాణంలో సహాయం"</item>
     <item msgid="437655393941385937">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
     <item msgid="973363520315356844">"ఫోన్ స్థితిని చదవడం"</item>
@@ -355,7 +355,7 @@
     <item msgid="2546206711741159825">"సెల్ ప్రసారాలను చదవడం"</item>
     <item msgid="2363460595607829243">"డమ్మీ లొకేషన్"</item>
     <item msgid="3778165903878569143">"నిల్వను చదవడం"</item>
-    <item msgid="555939881912035315">"నిల్వలో వ్రాయడం"</item>
+    <item msgid="555939881912035315">"నిల్వలో రాయడం"</item>
     <item msgid="4281352581602735717">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="346122795998225472">"ఖాతాలను పొందడం"</item>
     <item msgid="3756073389408535680">"నేపథ్యంలో అమలు చేయడం"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 69a9bdc..54e54ba 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -48,7 +48,7 @@
     <string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"USB నిల్వను ఎరేజ్ చేయండి"</string>
     <string name="sdcard_format" product="default" msgid="3676635435136326182">"SD కార్డు‌ను ఎరేజ్ చేయండి"</string>
     <string name="preview_pager_content_description" msgid="3762247188224576303">"ప్రివ్యూ"</string>
-    <string name="preview_page_indicator_content_description" msgid="2790254666634885865">"పరిదృశ్యం, <xliff:g id="NUM_PAGES">%2$d</xliff:g>లో <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>వ పేజీ"</string>
+    <string name="preview_page_indicator_content_description" msgid="2790254666634885865">"ప్రివ్యూ, <xliff:g id="NUM_PAGES">%2$d</xliff:g>లో <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>వ పేజీ"</string>
     <string name="font_size_summary" msgid="1296835853522566260">"స్క్రీన్‌పై ఉండే టెక్స్ట్‌ను చిన్నదిగా లేదా పెద్దదిగా చేస్తుంది."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"చిన్నదిగా చేస్తుంది"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"పెద్దదిగా చేస్తుంది"</string>
@@ -320,7 +320,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"గోప్యత"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"అందుబాటులో లేదు"</string>
     <string name="security_status_title" msgid="6958004275337618656">"సెక్యూరిటీ స్టేటస్"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"స్క్రీన్ లాక్, Find My Device, యాప్ భద్రత"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"స్క్రీన్ లాక్, Find My Device, యాప్ సెక్యూరిటీ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ముఖం జోడించబడింది"</string>
     <string name="security_settings_face_preference_summary_none" msgid="5952752252122581846">"ఫేస్ అన్‌లాక్‌ను సెటప్ చేయడానికి ట్యాప్ చేయండి"</string>
     <string name="security_settings_face_preference_title" msgid="2126625155005348417">"ఫేస్ అన్‌లాక్"</string>
@@ -377,7 +377,7 @@
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="6835778900387289683">"ఫేస్ అన్‌లాక్ పనితీరును మెరుగుపరుచుకోండి"</string>
     <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="7055780282999744813">"ఫేస్ అన్‌లాక్‌ను మళ్లీ సెటప్ చేయండి"</string>
     <string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"ఫేస్ అన్‌లాక్‌ను మళ్లీ సెటప్ చేయండి"</string>
-    <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"భద్రత, పనితీరులను మెరుగుపరుచుకోండి"</string>
+    <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"సెక్యూరిటీని, పనితీరును మెరుగుపరుచుకోండి"</string>
     <string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"ఫేస్ అన్‌లాక్‌ను సెటప్ చేయండి"</string>
     <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"ఫేస్ అన్‌లాక్‌ను మళ్లీ సెటప్ చేయడానికి మీ ప్రస్తుత ఫేస్ మోడల్‌ను తొలగించండి.\n\nమీ ఫేస్ మోడల్ శాశ్వతంగా, సురక్షితంగా తొలగించబడుతుంది.\n\nతొలగించిన తర్వాత, మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి లేదా యాప్‌లలో ప్రామాణీకరణ కోసం మీకు మీ PIN, ఆకృతి లేదా పాస్‌వర్డ్ అవసరం."</string>
     <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"ఫేస్ అన్‌లాక్‌ను మళ్లీ సెటప్ చేయడానికి మీ ప్రస్తుత ఫేస్ మోడల్‌ను తొలగించండి.\n\nమీ ఫేస్ మోడల్ శాశ్వతంగా, సురక్షితంగా తొలగించబడుతుంది.\n\nతొలగించిన తర్వాత, మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి లేదా యాప్‌లలో ప్రామాణీకరణ కోసం మీకు మీ వేలిముద్ర, PIN, ఆకృతి లేదా పాస్‌వర్డ్ అవసరం."</string>
@@ -623,7 +623,7 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="1276283007274778191">"మీ టాబ్లెట్ రక్షించుకోండి"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="3585905639045649905">"మీ పరికరం రక్షించుకోండి"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="2758197863515864300">"మీ ఫోన్‌ను రక్షించుకోండి"</string>
-    <string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"అదనపు భద్రత కోసం, బ్యాకప్ స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
+    <string name="lock_settings_picker_biometrics_added_security_message" msgid="1105247657304421299">"అదనపు సెక్యూరిటీ కోసం, బ్యాకప్ స్క్రీన్ లాక్‌ను సెట్ చేయండి"</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
@@ -637,42 +637,42 @@
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4572132216801894216">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / స్లీప్ మోడ్‌లోకి వెళ్లిన <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> తర్వాత"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="7631371082326055429">"ఆఫీస్‌ ప్రొఫైల్ లాక్"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="4746783679112447948">"లాక్ స్క్రీన్ మార్చండి"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"ఆకృతి, పిన్‌ లేదా పాస్‌వర్డ్ భద్రతను మార్చండి లేదా నిలిపివేయండి"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="6023813780512501969">"ఆకృతి,PIN, పాస్‌వర్డ్‌ల మార్పు,డిజేబుల్ చేయడం"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="1699993191343299179">"స్క్రీన్ లాక్ చేయడం కోసం ఒక పద్ధతి ఎంచుకోండి"</string>
     <string name="unlock_set_unlock_off_title" msgid="2831957685685921667">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_off_summary" msgid="4578319976164001322"></string>
     <string name="unlock_set_unlock_none_title" msgid="2844029875174409728">"స్వైప్"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="641298008390890152">"భద్రత వద్దు"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="641298008390890152">"సెక్యూరిటీ వద్దు"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="8224895208452995332">"ఆకృతి"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="4482018884090552709">"మధ్యస్థ భద్రత"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="4482018884090552709">"మధ్యస్థ సెక్యూరిటీ"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5283636759362880407">"పిన్‌"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="1961863114590024945">"మధ్యస్థం నుండి అధిక భద్రత"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="1961863114590024945">"మధ్యస్థం నుండి అధిక సెక్యూరిటీ"</string>
     <string name="unlock_set_unlock_password_title" msgid="2559842616268607041">"పాస్‌వర్డ్"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="7647435233968707432">"అధిక భద్రత"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7647435233968707432">"అధిక సెక్యూరిటీ"</string>
     <string name="unlock_set_do_later_title" msgid="6565575303676064364">"ఇప్పుడు కాదు"</string>
     <string name="current_screen_lock" msgid="1367883977261098017">"ప్రస్తుత స్క్రీన్ లాక్"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"వేలిముద్ర + ఆకృతి"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"వేలిముద్ర + పిన్"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"వేలిముద్ర + పాస్‌వర్డ్"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"వేలిముద్ర లేకుండా కొనసాగండి"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"మీరు మీ వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఎంపికకు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"మీరు మీ వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ఫేస్ అన్‌లాక్ + ఆకృతి"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ఫేస్ అన్‌లాక్ + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ఫేస్ అన్‌లాక్ + పాస్‌వర్డ్"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ఫేస్ అన్‌లాక్ లేకుండానే కొనసాగించండి"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఎంపికకు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="face_unlock_title" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ఆకృతి • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"పాస్‌వర్డ్ • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ఫేస్ లేదా వేలిముద్ర లేకుండా కొనసాగించండి"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"మీరు మీ ముఖం లేదా వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="biometrics_unlock_title" msgid="616524056055233041">"మీరు మీ ముఖాన్ని లేదా వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"స్వైప్"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"ఆకృతి"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="9028659554829888373">"పిన్‌"</string>
     <string name="unlock_set_unlock_mode_password" msgid="8810609692771987513">"పాస్‌వర్డ్"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"మీరు స్క్రీన్ లాక్‌ను సెటప్ చేసిన తర్వాత, సెట్టింగ్‌లు &gt; భద్రతలో మీ వేలిముద్రను కూడా సెటప్ చేయవచ్చు."</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"మీరు స్క్రీన్ లాక్‌ను సెటప్ చేసిన తర్వాత, సెట్టింగ్‌లు &gt; సెక్యూరిటీలో మీ వేలిముద్రను కూడా సెటప్ చేయవచ్చు."</string>
     <string name="unlock_disable_lock_title" msgid="2564279819907932759">"స్క్రీన్ లాక్‌ను ఆఫ్ చేయి"</string>
     <string name="unlock_disable_frp_warning_title" msgid="3606280046362811229">"స్క్రీన్ లాక్‌ను తొలగించాలా?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="1005284289723910461">"ప్రొఫైల్ సంరక్షణను తీసివేయాలా?"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"మీరు ఈ పిన్‌ను ఇతర డివైజ్‌లలో కూడా టైప్ చేయాల్సి రావచ్చు."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"మీరు ఈ పాస్‌కీని ఇతర పరికరంలో కూడా టైప్ చేయాల్సి రావచ్చు."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"దీనితో జత చేయడానికి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఇది ఈ పాస్‌కీని చూపుతోందని నిర్ధారించుకోండి:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"కోఆర్డినేటెడ్ సెట్‌తో పెయిర్ చేయడానికి నిర్ధారించండి"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"దీని నుండి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఈ పరికరంతో జత చేయాలా?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"దీనితో జత చేయడానికి:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>దీనిలో టైప్ చేయండి:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ఆపై తిరిగి వెళ్లు లేదా Enter నొక్కండి."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"మీ కాంటాక్ట్‌లకు, కాల్ హిస్టరీకి యాక్సెస్‌ను అనుమతించండి"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"కనెక్ట్ చేయడం సాధ్యం కాలేదు. మళ్లీ ప్రయత్నించండి."</string>
     <string name="device_details_title" msgid="1155622417516195481">"పరికర వివరాలు"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"పరికర బ్లూటూత్ అడ్రస్: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"పరికర బ్లూటూత్ అడ్రస్:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"పరికరాన్ని మర్చిపోవాలా?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"అనుబంధాన్ని తీసివేయి"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"యాప్‌ను డిస్‌కనెక్ట్ చేయాలా?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"సెట్టింగ్‌లను గుర్తుంచుకో"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"గరిష్ఠంగా కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలు"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"గరిష్ఠ సంఖ్యలో కనెక్ట్ అయిన బ్లూటూత్ ఆడియో పరికరాలను ఎంచుకోండి"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC స్ట్యాక్ డీబగ్ లాగ్"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC స్ట్యాక్ లాగింగ్ స్థాయిని పెంచండి"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"ప్రసారం చేయండి"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"మిర్రర్"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"వైర్‌లెస్ ప్రదర్శనను ప్రారంభించు"</string>
@@ -924,7 +928,7 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="3622326550467939809">"టాబ్లెట్ NFC పరికరాన్ని తాకినప్పుడు డేటా పరస్పర మార్పిడిని అనుమతించండి"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="1460871052409162980">"ఫోన్ NFC పరికరాన్ని తాకినప్పుడు డేటా పరస్పర మార్పిడిని అనుమతించండి"</string>
     <string name="nfc_disclaimer_title" msgid="3696580694485048039">"NFCని ఆన్ చేయండి"</string>
-    <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC ఈ పరికరం మరియు ఇతర సమీప పరికరాలు లేదా చెల్లింపు టెర్మినల్‌లు, యాక్సెస్ రీడర్‌లు మరియు పరస్పర చర్య కలిగి ఉండే ప్రకటనలు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
+    <string name="nfc_disclaimer_content" msgid="8256675597551036207">"NFC ఈ పరికరం, ఇతర సమీప పరికరాలు లేదా పేమెంట్ టెర్మినల్‌లు, యాక్సెస్ రీడర్‌లతో పాటు ఇంటరాక్టివ్ యాడ్‌లు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
     <string name="nfc_secure_settings_title" msgid="4906958426927741485">"NFC కోసం పరికరాన్ని అన్‌లాక్ చేయాలి"</string>
     <string name="nfc_secure_toggle_summary" product="default" msgid="407654335737959071">"స్క్రీన్ అన్‌లాక్ అయి ఉన్నప్పుడు మాత్రమే NFC ఉపయోగాన్ని అనుమతించండి"</string>
     <string name="android_beam_settings_title" msgid="2797963824490671295">"Android Beam"</string>
@@ -1007,7 +1011,7 @@
     <string name="wifi_hidden_network" msgid="6466834025375485596">"దాచబడిన నెట్‌వర్క్"</string>
     <string name="wifi_hidden_network_warning" msgid="3937433813754746158">"నెట్‌వర్క్ IDని మీ రూటర్ ప్రసారం చేయకపోయినట్లయితే, భవిష్యత్తులో దానికి కనెక్ట్ కావాలనుకుంటే, నెట్‌వర్క్‌ను \'దాచబడింది\' అని సెట్ చేయవచ్చు.\n\nనెట్‌వర్క్‌ను కనుగొనడానికి, మీ ఫోన్ దాని సిగ్నల్‌ను క్రమం తప్పకుండా ప్రసారం చేస్తుంది కాబట్టి దీనివల్ల సెక్యూరిటీ రిస్క్‌ ఏర్పడవచ్చు.\n\nనెట్‌వర్క్‌ను \'దాచబడింది\' అని సెట్ చేయడం వల్ల మీ రూటర్‌లోని సెట్టింగ్‌లలో మార్పు రాదు."</string>
     <string name="wifi_signal" msgid="4442182285304271424">"సిగ్నల్ సామర్థ్యం"</string>
-    <string name="wifi_status" msgid="5349199188871002778">"స్థితి"</string>
+    <string name="wifi_status" msgid="5349199188871002778">"స్టేటస్‌"</string>
     <string name="tx_wifi_speed" msgid="2368986629172050673">"ప్రసార లింక్ వేగం"</string>
     <string name="rx_wifi_speed" msgid="5167966079215111232">"స్వీకరించగల లింక్ వేగం"</string>
     <string name="wifi_speed" msgid="6562147734565434513">"లింక్ వేగం"</string>
@@ -1366,7 +1370,7 @@
     <string name="night_display_auto_mode_twilight" msgid="4291855156158833997">"సూర్యాస్తమయం నుండి సూర్యోదయం వరకు ఆన్ అవుతుంది"</string>
     <string name="night_display_start_time_title" msgid="2611541851596977786">"ప్రారంభ సమయం"</string>
     <string name="night_display_end_time_title" msgid="5243112480391192111">"ముగింపు సమయం"</string>
-    <string name="night_display_status_title" msgid="9006282950657941820">"స్థితి"</string>
+    <string name="night_display_status_title" msgid="9006282950657941820">"స్టేటస్‌"</string>
     <string name="night_display_temperature_title" msgid="857248782470764263">"తీవ్రత"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ఎప్పటికీ ఆటోమేటిక్‌గా ఆన్ కాదు"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g>కి ఆటోమేటిక్‌గా ఆన్ అవుతుంది"</string>
@@ -1491,9 +1495,9 @@
     <string name="build_number" msgid="9009733242117579826">"బిల్డ్ నంబర్"</string>
     <string name="module_version" msgid="1787518340082046658">"Google Play సిస్టమ్ అప్‌డేట్"</string>
     <string name="device_info_not_available" msgid="4804474466616712326">"అందుబాటులో లేదు"</string>
-    <string name="device_status_activity_title" msgid="1812666241137263882">"స్థితి"</string>
-    <string name="device_status" msgid="7988547478034984649">"స్థితి"</string>
-    <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"బ్యాటరీ, నెట్‌వర్క్ యొక్క స్థితి మరియు ఇతర సమాచారం"</string>
+    <string name="device_status_activity_title" msgid="1812666241137263882">"స్టేటస్‌"</string>
+    <string name="device_status" msgid="7988547478034984649">"స్టేటస్‌"</string>
+    <string name="device_status_summary" product="tablet" msgid="8826216824111648900">"బ్యాటరీ, నెట్‌వర్క్ యొక్క స్టేటస్‌ మరియు ఇతర సమాచారం"</string>
     <string name="device_status_summary" product="default" msgid="8132661857066128832">"ఫోన్ నంబర్, సిగ్నల్ మొ."</string>
     <string name="storage_settings" msgid="7472188817781592677">"స్టోరేజ్"</string>
     <string name="storage_settings_for_app" msgid="229425418984637483">"స్టోరేజ్ &amp; కాష్"</string>
@@ -1685,7 +1689,7 @@
     <string name="storage_wizard_ready_v2_external_body" msgid="3896836008684280905">"మీరు <xliff:g id="NAME">^1</xliff:g>కు కంటెంట్‌ను తరలించవచ్చు"</string>
     <string name="storage_wizard_ready_v2_internal_body" msgid="5710665992219332454">"కంటెంట్‌ని <xliff:g id="NAME">^1</xliff:g>కి తరలించాలంటే, "<b>"సెట్టింగ్‌లు &gt; నిల్వ"</b>"కి వెళ్లండి"</string>
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1269878056598666852">"మీ కంటెంట్ <xliff:g id="NAME_0">^1</xliff:g>కి తరలించబడింది. \n\nఈ <xliff:g id="NAME_1">^2</xliff:g>ని నిర్వహించాలంటే, "<b>"సెట్టింగ్‌లు &gt; నిల్వ"</b>"కి వెళ్లండి."</string>
-    <string name="battery_status_title" msgid="4661768220545945771">"బ్యాటరీ స్థితి"</string>
+    <string name="battery_status_title" msgid="4661768220545945771">"బ్యాటరీ స్టేటస్‌"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"బ్యాటరీ స్థాయి"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNలు"</string>
     <string name="apn_edit" msgid="2003683641840248741">"యాక్సెస్ పాయింట్‌ను ఎడిట్ చేయండి"</string>
@@ -1887,8 +1891,8 @@
     <string name="about_settings" product="tablet" msgid="2888705054709289693">"టాబ్లెట్ పరిచయం"</string>
     <string name="about_settings" product="default" msgid="4038626127378127613">"ఫోన్ వివరాలు"</string>
     <string name="about_settings" product="device" msgid="9012888717090302815">"పరికరం గురించి"</string>
-    <string name="about_settings" product="emulator" msgid="2516560858771320366">"పునరుత్పాదిత పరికరం గురించి"</string>
-    <string name="about_settings_summary" msgid="4831942939227432513">"చట్టపరమైన సమాచారం, స్థితి, సాఫ్ట్‌వేర్ సంస్కరణను చూడండి"</string>
+    <string name="about_settings" product="emulator" msgid="2516560858771320366">"ఎమ్యులేటర్ పరికరం గురించి"</string>
+    <string name="about_settings_summary" msgid="4831942939227432513">"చట్టపరమైన సమాచారం, స్టేటస్‌, సాఫ్ట్‌వేర్ సంస్కరణను చూడండి"</string>
     <string name="legal_information" msgid="7509900979811934843">"చట్టపరమైన సమాచారం"</string>
     <string name="contributors_title" msgid="7965640251547037965">"సహకారులు"</string>
     <string name="manual" msgid="3651593989906084868">"మాన్యువల్"</string>
@@ -1959,12 +1963,12 @@
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="9110305410672321714">"కొనసాగడానికి మీ కార్యాలయ నమూనాను ఉపయోగించండి"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="6524208128570235127">"కొనసాగడానికి మీ ఆఫీస్ పిన్ నెంబ‌ర్‌ను ఎంట‌ర్ చేయండి"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"కొనసాగడానికి మీ కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
-    <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"అదనపు భద్రత కోసం, మీ పరికరం నమూనాను ఉపయోగించండి"</string>
-    <string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"అదనపు భద్రత కోసం, మీ డివైజ్ పిన్‌ను నమోదు చేయండి"</string>
-    <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"అదనపు భద్రత కోసం, మీ పరికరం పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
-    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"అదనపు భద్రత కోసం, మీ కార్యాలయ నమూనాను ఉపయోగించండి"</string>
-    <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"అదనపు భద్రత కోసం, మీ కార్యాలయ పిన్‌ను నమోదు చేయండి"</string>
-    <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"అదనపు భద్రత కోసం, మీ కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"అదనపు సెక్యూరిటీ కోసం, మీ పరికర ఆకృతిని ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"అదనపు సెక్యూరిటీ కోసం, మీ పరికర పిన్‌ను ఎంటర్ చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"అదనపు సెక్యూరిటీ కోసం, మీ పరికరం పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"అదనపు సెక్యూరిటీ కోసం, మీ వర్క్ చేసే చోటుకు సంబంధించిన ఆకృతిని ఉపయోగించండి"</string>
+    <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"అదనపు సెక్యూరిటీ కోసం, మీరు వర్క్‌ చేసే చోటుకు సంబంధించిన పిన్‌ను ఎంటర్ చేయండి"</string>
+    <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"అదనపు సెక్యూరిటీ కోసం, మీరు వర్క్ చేసే చోటుకు సంబంధించిన పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"</string>
     <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత నమూనాను నమోదు చేయండి."</string>
     <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పిన్‌ని నమోదు చేయండి."</string>
     <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"మీ ఫోన్ ఫ్యాక్టరీ సెట్టింగ్‌లకు రీసెట్ అయింది. ఈ ఫోన్‌ని ఉపయోగించాలంటే, మీ గత పాస్‌వర్డ్ నమోదు చేయండి."</string>
@@ -2007,7 +2011,7 @@
     <string name="lock_settings_profile_unification_summary" msgid="1317553536289481654">"ఆఫీస్‌ ప్రొఫైల్, అలాగే పరికర స్క్రీన్ రెండింటి కోసం ఒకే లాక్‌ను ఉపయోగించు"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="5163178097464820825">"ఒకే లాక్‌ని ఉపయోగించాలా?"</string>
     <string name="lock_settings_profile_unification_dialog_body" msgid="1222905637428672355">"మీ పరికరం మీ కార్యాలయ ప్రొఫైల్ స్క్రీన్ లాక్‌ని ఉపయోగిస్తుంది. లాక్‌లు రెండింటికీ కార్యాలయ విధానాలు వర్తిస్తాయి."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="8844682343443755895">"మీ కార్యాలయ ప్రొఫైల్ లాక్ మీ సంస్థ భద్రతా ఆవశ్యకాలకు అనుగుణంగా లేదు. మీరు మీ పరికర స్క్రీన్ మరియు మీ కార్యాలయ ప్రొఫైల్ రెండింటికీ ఒకే లాక్‌ను ఉపయోగించవచ్చు, కానీ ఏవైనా కార్యాలయ లాక్ విధానాలు వర్తిస్తాయి."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="8844682343443755895">"మీ వర్క్ ప్రొఫైల్ లాక్, మీ సంస్థ సెక్యూరిటీ ఆవశ్యకతలకు అనుగుణంగా లేదు. మీరు మీ పరికర స్క్రీన్‌కు, అలాగే మీ వర్క్ ప్రొఫైల్ రెండింటికీ ఒకే లాక్‌ను ఉపయోగించవచ్చు. అయితే ఏవైనా వర్క్ లాక్ పాలసీలు ఉంటే అవి మాత్రమే వర్తిస్తాయి."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="6276915393736137843">"ఒకే లాక్‌ని ఉపయోగించండి"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8509287115116369677">"ఒకే లాక్‌ని ఉపయోగించండి"</string>
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"పరికర స్క్రీన్ లాక్ లాంటిది"</string>
@@ -2232,8 +2236,8 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="2117468247460253346">"భాష:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="4560494723256242785">"పదాన్ని టైప్ చేయండి"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="6209624157217434640">"ఆప్షనల్ షార్ట్‌కట్"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="316493656442362284">"పదాన్ని సవరించు"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="4909198741914531509">"సవరించు"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="316493656442362284">"పదాన్ని ఎడిట్ చేయండి"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="4909198741914531509">"ఎడిట్"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="651550824433043545">"తొలగించు"</string>
     <string name="user_dict_settings_empty_text" msgid="86562873609647919">"మీకు వినియోగదారు నిఘంటువులో పదాలు ఏవీ లేవు. పదాన్ని జోడించడానికి, జోడించు (+) బటన్‌ను నొక్కండి."</string>
     <string name="user_dict_settings_all_languages" msgid="8563387437755363526">"అన్ని భాషల కోసం"</string>
@@ -2497,8 +2501,8 @@
     <string name="captioning_custom_options_title" msgid="3858866498893566351">"అనుకూల ఎంపికలు"</string>
     <string name="captioning_background_color" msgid="5231412761368883107">"నేపథ్య రంగు"</string>
     <string name="captioning_background_opacity" msgid="6453738649182382614">"నేపథ్య అపారదర్శకత"</string>
-    <string name="captioning_window_color" msgid="1406167274530183119">"శీర్షిక విండో రంగు"</string>
-    <string name="captioning_window_opacity" msgid="4031752812991199525">"శీర్షిక విండో అపారదర్శకత"</string>
+    <string name="captioning_window_color" msgid="1406167274530183119">"క్యాప్షన్‌ విండో రంగు"</string>
+    <string name="captioning_window_opacity" msgid="4031752812991199525">"క్యాప్షన్‌ విండో అపారదర్శకత"</string>
     <string name="captioning_foreground_color" msgid="9057327228286129232">"వచన రంగు"</string>
     <string name="captioning_foreground_opacity" msgid="1395843080697567189">"వచన అపారదర్శకత"</string>
     <string name="captioning_edge_color" msgid="6035818279902597518">"అంచు రంగు"</string>
@@ -2670,7 +2674,7 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"ఛార్జింగ్ తాత్కాలికంగా పరిమితం చేయబడింది"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"మీ బ్యాటరీని కాపాడటానికి. మరింత తెలుసుకోండి."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"ఛార్జింగ్‌ను కొనసాగించండి"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"అధిక ఉష్ణోగ్రతలు, దీర్ఘకాలిక ఛార్జింగ్ వంటి కొన్ని సందర్భాలలో, బ్యాటరీ స్థితిని కాపాడటానికి ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g>కు పరిమితం చేయబడవచ్చు.\n\nఆ పరిస్థితులు మారినప్పుడు, మీ ఫోన్ ఆటోమేటిక్‌గా సాధారణంగా ఛార్జ్ అవుతుంది."</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"అధిక ఉష్ణోగ్రతలు, సుదీర్ఘ ఛార్జింగ్ వంటి కొన్ని సందర్భాల్లో, బ్యాటరీని కాపాడటానికి ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g>నికి పరిమితం చేయబడవచ్చు.\n\nఆ పరిస్థితులు మారినప్పుడు, మీ ఫోన్ ఆటోమేటిక్‌గా సాధారణంగా ఛార్జ్ అవుతుంది."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"అధిక ఉష్ణోగ్రతలు, దీర్ఘకాలిక ఛార్జింగ్ వంటి కొన్ని సందర్భాలలో, బ్యాటరీ స్థితిని కాపాడటానికి ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g>కు పరిమితం చేయబడవచ్చు.\n\nఆ పరిస్థితులు మారినప్పుడు, మీ టాబ్లెట్ ఆటోమేటిక్‌గా సాధారణంగా ఛార్జ్ అవుతుంది."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"మీరు మీ ఫోన్‌ను సాధారణం కంటే ఎక్కువగా ఉపయోగించారు కాబట్టి, సాధారణంగా ఖాళీ అయ్యే సమయం కంటే త్వరగా మీ బ్యాటరీ ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని ఎక్కువగా ఉపయోగిస్తున్న యాప్‌లు:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"మీరు మీ టాబ్లెట్‌ను సాధారణం కంటే ఎక్కువగా ఉపయోగించారు కాబట్టి, సాధారణంగా ఖాళీ అయ్యే సమయం కంటే త్వరగా మీ బ్యాటరీ ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని ఎక్కువగా ఉపయోగిస్తున్న యాప్‌లు:"</string>
@@ -3259,7 +3263,7 @@
     <string name="vpn_no_network" msgid="7187593680049843763">"నెట్‌వర్క్ కనెక్షన్ లేదు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vpn_disconnected" msgid="7694522069957717501">"VPN నుండి డిస్‌కనెక్ట్ చేయబడింది"</string>
     <string name="vpn_disconnected_summary" msgid="721699709491697712">"దేనికీ కనెక్ట్ కాలేదు"</string>
-    <string name="vpn_missing_cert" msgid="5397309964971068272">"ఒక సర్టిఫికెట్ లేదు. ప్రొఫైల్‌ని సవరించడానికి ప్రయత్నించండి."</string>
+    <string name="vpn_missing_cert" msgid="5397309964971068272">"ఒక సర్టిఫికెట్ లేదు. ప్రొఫైల్‌ను ఎడిట్ చేయడానికి ప్రయత్నించండి."</string>
     <string name="trusted_credentials_system_tab" msgid="675362923690364722">"సిస్టమ్"</string>
     <string name="trusted_credentials_user_tab" msgid="4978365619630094339">"యూజర్"</string>
     <string name="trusted_credentials_disable_label" msgid="6649583220519447947">"డిజేబుల్‌"</string>
@@ -3466,7 +3470,7 @@
     <string name="color_purple" msgid="6603701972079904843">"ఊదా రంగు"</string>
     <string name="sim_no_inserted_msg" msgid="7272710974813741735">"సిమ్ కార్డులు ఏవీ చొప్పించబడలేదు"</string>
     <string name="sim_status_title" msgid="6188770698037109774">"SIM స్టేటస్"</string>
-    <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"సిమ్ స్థితి (సిమ్ స్లాట్ %1$d)"</string>
+    <string name="sim_status_title_sim_slot" msgid="4932996839194493313">"సిమ్ స్టేటస్‌ (సిమ్ స్లాట్ %1$d)"</string>
     <string name="sim_call_back_title" msgid="4274099761123657464">"ఆటోమేటిక్ SIM నుండి తిరిగి కాల్ చేయి"</string>
     <string name="sim_outgoing_call_title" msgid="7759080345748128897">"అవుట్‌గోయింగ్ కాల్స్‌ల కోసం సిమ్"</string>
     <string name="sim_other_call_settings" msgid="5956308869284958883">"ఇతర కాల్ సెట్టింగ్‌లు"</string>
@@ -3528,7 +3532,7 @@
     <string name="keywords_display_wallpaper" msgid="8478137541939526564">"నేపథ్యం, వ్యక్తిగతీకరించు, డిస్‌ప్లేని అనుకూలీకరించు"</string>
     <string name="keywords_display_font_size" msgid="3593317215149813183">"టెక్స్ట్ సైజ్"</string>
     <string name="keywords_display_cast_screen" msgid="2572331770299149370">"ప్రొజెక్ట్, ప్రసారం, స్క్రీన్ మిర్రరింగ్, స్క్రీన్ షేరింగ్, మిర్రరింగ్, షేర్ స్క్రీన్, స్క్రీన్ ప్రసారం"</string>
-    <string name="keywords_storage" msgid="3004667910133021783">"స్థలం, డిస్క్, హార్డ్ డ్రైవ్, పరికర వినియోగం"</string>
+    <string name="keywords_storage" msgid="3004667910133021783">"స్పేస్, డిస్క్, హార్డ్ డ్రైవ్, పరికర వినియోగం"</string>
     <string name="keywords_battery" msgid="7040323668283600530">"శక్తి వినియోగం, ఛార్జ్"</string>
     <string name="keywords_battery_usage" msgid="1763573071014260220">"బ్యాటరీ వినియోగాన్ని చూడండి, బ్యాటరీ వినియోగం, పవర్ వినియోగం"</string>
     <string name="keywords_battery_saver" msgid="6289682844453234359">"బ్యాటరీ సేవర్, పవర్ సేవర్, సేవర్"</string>
@@ -3549,7 +3553,7 @@
     <string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"వచన దిద్దుబాటు, దిద్దుబాటు చేయి, ధ్వని, వైబ్రేట్, స్వయంచాలకం, భాష, సంజ్ఞ, సూచించు, సూచన, థీమ్, అభ్యంతరకరం, పదం, రకం, ఎమోజీ, అంతర్జాతీయం"</string>
     <string name="keywords_reset_apps" msgid="8254315757754930862">"రీసెట్, ప్రాధాన్యతలు, ఆటోమేటిక్"</string>
     <string name="keywords_all_apps" msgid="9016323378609007166">"యాప్‌లు, డౌన్‌లోడ్, యాప్‌లు, సిస్టమ్"</string>
-    <string name="keywords_app_permissions" msgid="2061773665663541610">"యాప్‌లు, అనుమతులు, భద్రత"</string>
+    <string name="keywords_app_permissions" msgid="2061773665663541610">"యాప్‌లు, అనుమతులు, సెక్యూరిటీ"</string>
     <string name="keywords_default_apps" msgid="4601664230800605416">"యాప్‌లు, ఆటోమేటిక్"</string>
     <string name="keywords_ignore_optimizations" msgid="8967142288569785145">"ఆప్టిమైజేషన్‌లు నిద్రావస్థ, యాప్ స్టాండ్‌బైలను  విస్మరించు"</string>
     <string name="keywords_color_mode" msgid="1193896024705705826">"వైబ్రెంట్, RGB, sRGB, కలర్, న్యాచురల్, స్టాండర్డ్"</string>
@@ -3568,7 +3572,7 @@
     <string name="keywords_imei_info" msgid="8848791606402333514">"imei, meid, min, prl వెర్షన్, imei sv"</string>
     <string name="keywords_sim_status" msgid="8784456547742075508">"నెట్‌వర్క్, మొబైల్ నెట్‌వర్క్ స్థితి, సేవ స్థితి, సిగ్నల్ సామర్థ్యం, మొబైల్ నెట్‌వర్క్ రకం, రోమింగ్, iccid, eid"</string>
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"క్రమ సంఖ్య, హార్డ్‌వేర్ వెర్షన్"</string>
-    <string name="keywords_android_version" msgid="1629882125290323070">"android భద్రతా అతికింపు స్థాయి, బేస్‌బ్యాండ్ వెర్షన్, కెర్నెల్ వెర్షన్"</string>
+    <string name="keywords_android_version" msgid="1629882125290323070">"android సెక్యూరిటీ ప్యాచ్ స్థాయి, బేస్‌బ్యాండ్ వెర్షన్, కెర్నెల్ వెర్షన్"</string>
     <string name="keywords_dark_ui_mode" msgid="6373999418195344014">"రూపం, లైట్, ముదురు, మోడ్, కాంతి సున్నితత్వం, ఫోటోఫోబియా, ముదురుగా చేయి, మరింత ముదురు, డార్క్ మోడ్, మైగ్రేన్"</string>
     <string name="keywords_systemui_theme" msgid="6341194275296707801">"ముదురు రంగు రూపం"</string>
     <string name="keywords_device_feedback" msgid="5489930491636300027">"బగ్"</string>
@@ -3648,7 +3652,7 @@
     <string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"షెడ్యూల్‌లు"</string>
     <string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"షెడ్యూల్‌ల తీసివేత"</string>
     <string name="zen_mode_schedule_delete" msgid="5383420576833765114">"తొలగించు"</string>
-    <string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"సవరించు"</string>
+    <string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ఎడిట్"</string>
     <string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"షెడ్యూల్‌లు"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"షెడ్యూల్ చేయి"</string>
     <string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"షెడ్యూల్"</string>
@@ -3667,7 +3671,7 @@
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="2152115038156049608">"నోటిఫికేషన్‌లు వచ్చినప్పుడు మీ ఫోన్ శబ్దం చేయదు లేదా వైబ్రేట్‌ అవదు"</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5997930361607752541">"నోటిఫికేషన్‌లు కనిపించవు, వినిపించవు"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="6005445725686969583">"మీరు నోటిఫికేషన్‌లను చూడలేరు లేదా వినలేరు"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"మీ ఫోన్ ఈ మోడ్‌లో ఉన్నప్పుడు కొత్తగా వచ్చే లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూపడం, వైబ్రేట్ చేయడం లేదంటే శబ్దం చేయడం జరగదు. అయితే ఫోన్ యాక్టివిటీ అలాగే దాని స్థితికి సంబంధించిన కొన్ని ముఖ్యమైన నోటిఫికేషన్‌లు మాత్రం ఇప్పటికీ కనిపిస్తాయి అని గుర్తుంచుకోండి.\n\n అలాగే అంతరాయం కలిగించవద్దు ఫీచర్‌ను ఆఫ్ చేసినప్పుడు మీకు వచ్చిన నోటిఫికేషన్‌లను చూసేందుకు మీ స్క్రీన్ పై నుండి కిందికి స్వైప్ చేస్తే చాలు."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"మీ ఫోన్ ఈ మోడ్‌లో ఉన్నప్పుడు కొత్తగా వచ్చే లేదా ఇప్పటికే ఉన్న నోటిఫికేషన్‌లను చూపడం, వైబ్రేట్ చేయడం లేదంటే శబ్దం చేయడం జరగదు. అయితే ఫోన్ యాక్టివిటీ అలాగే దాని స్టేటస్‌కి సంబంధించిన కొన్ని ముఖ్యమైన నోటిఫికేషన్‌లు మాత్రం ఇప్పటికీ కనిపిస్తాయి అని గుర్తుంచుకోండి.\n\n అలాగే అంతరాయం కలిగించవద్దు ఫీచర్‌ను ఆఫ్ చేసినప్పుడు మీకు వచ్చిన నోటిఫికేషన్‌లను చూసేందుకు మీ స్క్రీన్ పై నుండి కిందికి స్వైప్ చేస్తే చాలు."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="5469078057954463796">"అనుకూలం"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4303255634151330401">"అనుకూల సెట్టింగ్‌ని ప్రారంభించండి"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="5062332754972217218">"అనుకూల సెట్టింగ్‌ని తీసివేయండి"</string>
@@ -3756,7 +3760,7 @@
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"గత 7 రోజుల నుండి అన్నింటినీ చూడండి"</string>
     <string name="general_notification_header" msgid="3669031068980713359">"మేనేజ్ చేయండి"</string>
     <string name="app_notification_field" msgid="3858667320444612716">"యాప్ సెట్టింగ్‌లు"</string>
-    <string name="app_notification_field_summary" msgid="5981393613897713471">"వ్యక్తిగత యాప్‌ల నుండి నోటిఫికేషన్‌లను కంట్రోల్ చేయండి"</string>
+    <string name="app_notification_field_summary" msgid="5981393613897713471">"ఒక్కో యాప్ నుండి వచ్చే నోటిఫికేషన్‌లను వేర్వేరుగా కంట్రోల్ చేయండి"</string>
     <string name="advanced_section_header" msgid="6478709678084326738">"సాధారణ సెట్టింగ్‌లు"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"కార్యాలయ నోటిఫికేషన్‌లు"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"అనుకూల నోటిఫికేషన్‌లు"</string>
@@ -3781,7 +3785,7 @@
     <string name="notification_history_open_notification" msgid="2655071846911258371">"నోటిఫికేషన్‌ను తెరువు"</string>
     <string name="snooze_options_title" msgid="2109795569568344617">"నోటిఫికేషన్‌లను తాత్కాలికంగా ఆపివేయడాన్ని అనుమతించు"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"సాధారణ నోటిఫికేషన్‌ల చిహ్నాలను దాచి పెట్టు"</string>
-    <string name="hide_silent_icons_summary" msgid="623763437631637232">"సాధారణ నోటిఫికేషన్‌లకు సంబంధించిన చిహ్నాలు స్థితి పట్టీలో చూపబడవు"</string>
+    <string name="hide_silent_icons_summary" msgid="623763437631637232">"సాధారణ నోటిఫికేషన్‌లకు సంబంధించిన చిహ్నాలు స్టేటస్‌ పట్టీలో చూపబడవు"</string>
     <string name="notification_badging_title" msgid="5469616894819568917">"యాప్ చిహ్నంపై నోటిఫికేషన్ డాట్"</string>
     <string name="notification_people_strip_title" msgid="1185857822541001139">"ఇటీవలి సంభాషణల స్ట్రిప్‌ను చూపు"</string>
     <string name="notification_bubbles_title" msgid="5681506665322329301">"బబుల్స్"</string>
@@ -3810,13 +3814,13 @@
     <string name="swipe_direction_rtl" msgid="1707391213940663992">"తీసివేయడానికి ఎడమకు, మెనూను చూపడానికి కుడికి స్వైప్ చేయండి"</string>
     <string name="gentle_notifications_title" msgid="2793492905132530991">"అనుకూల నోటిఫికేషన్‌లు"</string>
     <string name="gentle_notifications_also_display" msgid="8617545395880297691">"వీటిలో కూడా ప్రదర్శిస్తుంది"</string>
-    <string name="gentle_notifications_display_status" msgid="7410244447768694856">"స్థితి పట్టీ"</string>
+    <string name="gentle_notifications_display_status" msgid="7410244447768694856">"స్టేటస్‌ పట్టీ"</string>
     <string name="gentle_notifications_display_lock" msgid="1914245082527924144">"లాక్ స్క్రీన్"</string>
     <string name="gentle_notifications_education" msgid="5957509621826384362">"అనుకూల నోటిఫికేషన్‌లు అనేవి ఎల్లప్పుడూ నిశబ్దంగానే వస్తాయి మరియు అవి ఎప్పుడూ కిందకు-లాగే షేడ్‌లో కనిపిస్తాయి"</string>
     <string name="gentle_notifications_display_summary_shade" msgid="7616926954719310445">"కిందకు-లాగే షేడ్‌లో మాత్రమే ప్రదర్శింపబడుతుంది"</string>
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"కిందకు-లాగే షేడ్ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శిస్తుంది"</string>
-    <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"కిందకు-లాగే షేడ్ &amp; స్థితి పట్టీ‌లో ప్రదర్శిస్తుంది"</string>
-    <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"కిందకు-లాగే షేడ్, స్థితి పట్టీ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శింపబడుతుంది"</string>
+    <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"కిందకు-లాగే షేడ్ &amp; స్టేటస్‌ పట్టీ‌లో ప్రదర్శిస్తుంది"</string>
+    <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"కిందకు-లాగే షేడ్, స్టేటస్‌ పట్టీ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శింపబడుతుంది"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"స్టేటస్ బార్‌లో నిశ్శబ్ద నోటిఫికేషన్‌లను దాచు"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
     <string name="lock_screen_notifications_title" msgid="2876323153692406203">"గోప్యత"</string>
@@ -4176,7 +4180,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
     <string name="zen_mode_screen_on" msgid="7312758100468915319">"స్క్రీన్ ఆన్‌లో ఉన్నప్పుడు"</string>
-    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"అంతరాయం కలిగించవద్దు నిశ్శబ్దం చేసిన నోటిఫికేషన్‌లు స్క్రీన్‌లో పాప్-అప్ వలె కనిపించి, స్థితి బార్ చిహ్నాన్ని చూపడానికి అనుమతించు"</string>
+    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"అంతరాయం కలిగించవద్దు నిశ్శబ్దం చేసిన నోటిఫికేషన్‌లు స్క్రీన్‌లో పాప్-అప్ వలె కనిపించి, స్టేటస్‌ బార్ చిహ్నాన్ని చూపడానికి అనుమతించు"</string>
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"అంతరాయం కలిగించవద్దు ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లను స్క్రీన్‌ని ఆన్ అయ్యేలా మరియు కాంతి మిణుకుమిణుకుమనేలా చేయనివ్వండి"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"అంతరాయం కలిగించవద్దు ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్‌లను స్క్రీన్‌ని ఆన్ చేయనివ్వండి"</string>
@@ -4918,7 +4922,7 @@
     <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"ప్రతి యాప్‌లో గడిపిన సమయం మరియు ఉపయోగించిన డేటా"</string>
     <string name="enterprise_privacy_network_logs" msgid="3081744541193695887">"అత్యంత ఇటీవలి నెట్‌వర్క్ ట్రాఫిక్ లాగ్"</string>
     <string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"అత్యంత ఇటీవలి బగ్ రిపోర్ట్‌"</string>
-    <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"అత్యంత ఇటీవలి భద్రతా లాగ్"</string>
+    <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"అత్యంత ఇటీవలి సెక్యూరిటీ లాగ్"</string>
     <string name="enterprise_privacy_none" msgid="6026527690979756431">"ఏదీ లేదు"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"యాప్‌లు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"యాప్‌ల సంఖ్య అంచనా సమాచారం మాత్రమే. Play Store నుండి ఇన్‌స్టాల్ చేయని యాప్‌లను ఇందులో పరిగణనలోకి తీసుకుని ఉండకపోవచ్చు."</string>
@@ -5035,7 +5039,7 @@
     <string name="device_theme" msgid="5027604586494772471">"పరికర రూపం"</string>
     <string name="default_theme" msgid="4815428567082263639">"ఆటోమేటిక్"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"నెట్‌వర్క్ పేరు"</string>
-    <string name="show_operator_name_summary" msgid="5352696579216501773">"స్థితి పట్టీలో నెట్‌వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
+    <string name="show_operator_name_summary" msgid="5352696579216501773">"స్టేటస్‌ పట్టీలో నెట్‌వర్క్ పేరును ప్రదర్శిస్తుంది"</string>
     <string name="storage_manager_indicator" msgid="6187509172735927297">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="2705959642617709265">"ఆఫ్‌లో ఉంది"</string>
     <string name="storage_manager_indicator_on" msgid="8380330763647785309">"ఆన్‌లో ఉంది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 81356a5..e017df1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"คุณอาจจำเป็นต้องพิมพ์รหัส PIN นี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"คุณอาจจำเป็นต้องพิมพ์รหัสผ่านนี้ลงในอุปกรณ์อีกเครื่องหนึ่งด้วยเช่นกัน"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"หากต้องการจับคู่กับ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ตรวจสอบให้แน่ใจว่าอุปกรณ์แสดงรหัสผ่านนี้:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"ยืนยันการจับคู่กับชุดที่ทำงานร่วมกัน"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"จาก:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;จับคู่กับอุปกรณ์นี้หรือไม่"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ในการจับคู่กับ: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ให้พิมพ์: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> แล้วกด Return หรือ Enter"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ให้สิทธิ์เข้าถึงรายชื่อติดต่อและประวัติการโทร"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"ไม่สามารถเชื่อมต่อ โปรดลองอีกครั้ง"</string>
     <string name="device_details_title" msgid="1155622417516195481">"รายละเอียดอุปกรณ์"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"ที่อยู่บลูทูธของอุปกรณ์: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"ที่อยู่บลูทูธของอุปกรณ์: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"ไม่จำอุปกรณ์ใช่ไหม"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"นำการเชื่อมโยงออก"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ยกเลิกการเชื่อมต่อแอปใช่ไหม"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"จำการตั้งค่า"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"จำนวนอุปกรณ์เสียงบลูทูธที่เชื่อมต่อสูงสุด"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"เลือกจำนวนสูงสุดสำหรับอุปกรณ์เสียงบลูทูธที่เชื่อมต่อ"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"บันทึกการแก้ไขข้อบกพร่องของสแต็ก NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"เพิ่มระดับการบันทึกสแต็ก NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"แคสต์"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"มิเรอร์"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"เปิดใช้การแสดงผลแบบไร้สาย"</string>
@@ -2295,11 +2299,11 @@
     <string name="accessibility_magnification_area_settings_message" msgid="8498648925928109462">"ขยายเป็นเต็มหน้าจอ ขยายพื้นที่ที่เจาะจง หรือจะสลับไปมาระหว่างตัวเลือกทั้ง 2 อย่างก็ได้"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"เต็มหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="9191632962955877019">"หน้าจอบางส่วน"</string>
-    <string name="accessibility_magnification_area_settings_all_summary" msgid="8107511976748799455">"สลับไปมาระหว่างหน้าจอแบบเต็มกับบางส่วน"</string>
+    <string name="accessibility_magnification_area_settings_all_summary" msgid="8107511976748799455">"สลับไปมาระหว่างแบบเต็มหน้าจอกับบางส่วน"</string>
     <string name="accessibility_magnification_mode_dialog_title" msgid="9151027667059878578">"เลือกวิธีขยาย"</string>
     <string name="accessibility_magnification_mode_dialog_option_full_screen" msgid="4892487869954032029">"ขยายเป็นเต็มหน้าจอ"</string>
     <string name="accessibility_magnification_mode_dialog_option_window" msgid="4492443201099153362">"ขยายบางส่วนของหน้าจอ"</string>
-    <string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"สลับไปมาระหว่างหน้าจอแบบเต็มกับบางส่วน"</string>
+    <string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"สลับไปมาระหว่างแบบเต็มหน้าจอกับบางส่วน"</string>
     <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"แตะปุ่มเปลี่ยนเพื่อสลับไปมาระหว่างทั้ง 2 ตัวเลือก"</string>
     <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"เปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษใช่ไหม"</string>
     <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"การใช้การแตะ 3 ครั้งเพื่อขยายบางส่วนของหน้าจอจะทำให้การพิมพ์และการดำเนินการอื่นๆ ล่าช้า\n\nปุ่มการช่วยเหลือพิเศษจะลอยอยู่บนหน้าจอเหนือแอปอื่นๆ แตะปุ่มดังกล่าวเพื่อขยาย"</string>
@@ -4556,7 +4560,7 @@
     <string name="display_dashboard_summary" msgid="1599453894989339454">"ธีมมืด, ขนาดตัวอักษร, ความสว่าง"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"เข้าโหมดสลีปหลังจากไม่มีการใช้งาน 10 นาที"</string>
     <string name="memory_summary" msgid="8221954450951651735">"ใช้หน่วยความจำไป <xliff:g id="USED_MEMORY">%1$s</xliff:g> จาก <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> โดยเฉลี่ย"</string>
-    <string name="users_summary" msgid="8473589474976307510">"ลงชื่อเข้าใช้เป็น <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="8473589474976307510">"ลงชื่อเข้าใช้เป็น<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="5513009140568552693">"<xliff:g id="APP_NAME">%1$s</xliff:g> เป็นค่าเริ่มต้น"</string>
     <string name="backup_disabled" msgid="4503062265560959320">"ปิดใช้การสำรองข้อมูลอยู่"</string>
     <string name="android_version_summary" msgid="7818952662015042768">"อัปเดตเป็น Android <xliff:g id="VERSION">%1$s</xliff:g> แล้ว"</string>
@@ -4816,7 +4820,7 @@
     <string name="double_twist_for_camera_suggestion_title" msgid="8178844037382604158">"ถ่ายเซลฟีได้เร็วขึ้น"</string>
     <string name="system_navigation_title" msgid="1698862900901417194">"การนำทางของระบบ"</string>
     <string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"การนำทางแบบ 2 ปุ่ม"</string>
-    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"สลับแอปโดยเลื่อนนิ้วขึ้นบนปุ่มหน้าแรก ดูแอปทั้งหมดโดยเลื่อนขึ้นอีกครั้ง กลับโดยแตะปุ่มกลับ"</string>
+    <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"สลับแอปโดยปัดขึ้นบนปุ่มหน้าแรก ดูแอปทั้งหมดโดยปัดขึ้นอีกครั้ง กลับโดยแตะปุ่มกลับ"</string>
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"ลองใช้ปุ่มหน้าแรกใหม่"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"เปิดท่าทางสัมผัสใหม่เพื่อสลับแอป"</string>
     <string name="emergency_settings_preference_title" msgid="6183455153241187148">"ความปลอดภัยและกรณีฉุกเฉิน"</string>
@@ -4896,7 +4900,7 @@
     <string name="instant_apps_settings" msgid="4280942494969957858">"ค่ากำหนดของ Instant Apps"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"แอปที่ติดตั้ง"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"ตัวจัดการพื้นที่เก็บข้อมูลกำลังจัดการพื้นที่เก็บข้อมูลของคุณ"</string>
-    <string name="account_for_section_header" msgid="7466759342105251096">"บัญชีสำหรับ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="account_for_section_header" msgid="7466759342105251096">"บัญชีสำหรับ<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"กำหนดค่า"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"ซิงค์ข้อมูลแอปโดยอัตโนมัติ"</string>
     <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"ซิงค์ข้อมูลส่วนบุคคลอัตโนมัติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c59e9f4..73c0bd0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Maaari mo ring kailanganing i-type ang PIN na ito sa isa pang device."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Maaari mo ring kailanganing i-type ang passkey na ito sa iba pang device."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Upang makipagpares sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Tiyaking ipinapakita nito ang passkey na ito:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Kumpirmahin para ipares sa coordinated na set"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Mula sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Makipagpares sa device na ito?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Upang ipares sa:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Mag-type dito:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, pagkatapos ay pindutin ang Return o Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Payagan ang access sa iyong mga contact at history ng tawag"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Hindi makakonekta. Subukang muli."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Mga detalye ng device"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Bluetooth address ng device: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Address ng bluetooth ng device:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Kalimutan ang device?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Alisin ang asosasyon"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"I-diskonekta ang App?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Tandaan ang mga setting"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum na nakakonektang mga Bluetooth audio device"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Piliin ang maximum na bilang ng mga nakakonektang Bluetooth audio device"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Log ng pag-debug ng stack ng NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Pataasin ang antas ng pag-log ng stack ng NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"I-cast"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"mirror"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"I-enable ang wireless display"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b41bec2..6276c15 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Bu parolayı diğer cihazda da girmeniz gerekebilir."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Şu cihazla eşlemek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu parolanın göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Koordine grupla eşlemeyi onaylayın"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşlensin mi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihaz üzerinde <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> yazarak Return veya Enter tuşuna basın."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kişilerime ve çağrı geçmişime erişime izin ver"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Bağlanılamadı. Tekrar deneyin."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Cihaz ayrıntıları"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Cihazın Bluetooth adresi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Cihazın Bluetooth adresi:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Cihaz unutulsun mu?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"İlişkilendirmeyi kaldır"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Uygulamanın Bağlantısı Kesilsin Mi?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ayarları anımsa"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimum sayıda bağlı Bluetooth ses cihazı"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimum sayıda bağlı Bluetooth ses cihazı seç"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC yığını hata ayıklama günlüğü"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"NFC yığını günlük kaydı seviyesini artırın"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Yayınlama"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"ayna"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Kablosuz görüntülemeyi etkinleştir"</string>
@@ -1334,7 +1338,7 @@
     <string name="auto_brightness_very_high_title" msgid="4935132626750630713">"Çok yüksek"</string>
     <string name="auto_brightness_subtitle" msgid="6839449395639517870">"Tercih ettiğiniz parlaklık düzeyi"</string>
     <string name="auto_brightness_off_summary" msgid="4993150980274474226">"Mevcut ışık için ayarlama"</string>
-    <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"Daha fazla pil kullanımı"</string>
+    <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"Yüksek pil kullanımı"</string>
     <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"Parlaklık düzeyini mevcut ışık için optimize edin. Bu özellik açık olduğunda parlaklığı geçici olarak ayarlamaya devam edebilirsiniz."</string>
     <string name="auto_brightness_description" msgid="6807117118142381193">"Ekranınızın parlaklığı, bulunduğunuz ortama ve aktivitelerinize göre otomatik olarak ayarlanır. Otomatik parlaklık özelliğinin tercihlerinizi öğrenmesine yardımcı olmak için kaydırma çubuğunu manuel olarak hareket ettirebilirsiniz."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"Beyaz dengeyi göster"</string>
@@ -1433,7 +1437,7 @@
     <string name="doze_title" msgid="1523090408230862316">"Bildirimlerde ekranı uyandır"</string>
     <string name="doze_summary" msgid="8252867381522942804">"Ekran karanlıkken yeni bildirimler için açılır"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Saati ve bilgiyi daima göster"</string>
-    <string name="doze_always_on_summary" msgid="509097829739647852">"Daha fazla pil kullanımı"</string>
+    <string name="doze_always_on_summary" msgid="509097829739647852">"Yüksek pil kullanımı"</string>
     <string name="force_bold_text" msgid="4620929631102086716">"Kalın metin"</string>
     <string name="title_font_size" msgid="570613010306330622">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Metni daha büyük veya daha küçük yapın"</string>
@@ -2665,7 +2669,7 @@
     <string name="battery_tip_early_heads_up_done_title" msgid="7705597228709143337">"Pil Tasarrufu açık"</string>
     <string name="battery_saver_link_a11y" msgid="740558184830458845">"Pil tasarrufu hakkında daha fazla bilgi edinin"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Bazı özellikler sınırlı olabilir"</string>
-    <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Daha fazla pil kullanımı"</string>
+    <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Yüksek pil kullanımı"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"En fazla pil kullanan uygulamaları göster"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Şarj etme geçici olarak sınırlı"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Pilinizi korumak için. Daha fazla bilgi edinin."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2424b09..88bc67a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -859,6 +859,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Також потрібно ввести цей PIN-код на іншому пристрої."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Також потрібно ввести цей ключ доступу на іншому пристрої."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Щоб створити пару з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Переконайтеся, що відображається цей ключ доступу:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Підтвердьте, щоб підключатися до набору узгоджених пристроїв"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Від пристрою:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Створити пару з цим пристроєм?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Щоб створити пару з пристроєм: <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> Введіть на ньому: <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, а потім натисніть \"Повернутися\" або \"Ввійти\"."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволити доступ до контактів та історії викликів"</string>
@@ -892,6 +893,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Не вдалося під’єднатися. Повторіть спробу."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Про пристрій"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Адреса Bluetooth пристрою: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Адреса Bluetooth пристрою:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Забути пристрій?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Вилучити зв’язок"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Від’єднати додаток?"</string>
@@ -924,6 +926,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Запам\'ятати налашт."</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Максимальна кількість підключених аудіопристроїв Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Вибрати максимальну кількість підключених аудіопристроїв Bluetooth"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Журнал налагодження стеку NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Підвищити рівень реєстрації в журналі стеку NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Трансляція"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"дзеркалювання"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Увімкнути бездротовий екран"</string>
@@ -1880,7 +1884,7 @@
     <string name="mobile_connect_to_internet" msgid="8162654404357069060">"Під’єднайтеся до Інтернету"</string>
     <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Останні запити на геодані"</string>
     <string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"Показати всі"</string>
-    <string name="location_category_location_services" msgid="8163798686832434284">"Служби локації"</string>
+    <string name="location_category_location_services" msgid="8163798686832434284">"Геолокація"</string>
     <string name="location_title" msgid="5819154746934945021">"Моє місцезнах."</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Геодані для робочого профілю"</string>
     <string name="location_app_level_permissions" msgid="907206607664629759">"Доступ додатків до геоданих"</string>
@@ -1902,8 +1906,8 @@
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволити додаткам і сервісам будь-коли шукати мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Шукати пристрої Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
-    <string name="location_services_preference_title" msgid="604317859531782159">"Служби локації"</string>
-    <string name="location_services_screen_title" msgid="5640002489976602476">"Служби локації"</string>
+    <string name="location_services_preference_title" msgid="604317859531782159">"Геолокація"</string>
+    <string name="location_services_screen_title" msgid="5640002489976602476">"Геолокація"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Служби локації для роботи"</string>
     <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"Визначати часовий пояс за місцезнаходженням"</string>
     <string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Потрібен доступ до геоданих пристрою"</string>
@@ -3915,7 +3919,7 @@
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокований екран, екран блокування, пропустити, обходити"</string>
     <string name="locked_work_profile_notification_title" msgid="279367321791301499">"Коли робочий профіль заблоковано"</string>
     <string name="lock_screen_notifs_title" msgid="3412042692317304449">"Сповіщення на заблокованому екрані"</string>
-    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Показувати розмови (за умовчанням і беззвучні)"</string>
+    <string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Показувати розмови та сповіщення (за умовчанням і беззвучні)"</string>
     <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Приховати беззвучні розмови та сповіщення"</string>
     <string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Не показувати сповіщення"</string>
     <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Конфіденційні сповіщення"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index cf97917..ac08a47 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"‏آپ کو دوسرے آلہ پر بھی یہ PIN ٹائپ کرنے کی ضرورت پڑ سکتی ہے۔"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"آپ کو دیگر آلہ پر بھی اس پاس کلید کو ٹائپ کرنے کی ضرورت ہو سکتی ہے۔"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"‏اس کے ساتھ جوڑا بنانے کیلئے:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;اس بات کو یقینی بنائیں کہ یہ اس پاس کلید کو دکھا رہا ہے:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"مربوط سیٹ کے ساتھ جوڑا بنانے کی تصدیق کریں"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏منجانب:‎&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;‎اس آلہ کے ساتھ جوڑا بنائیں؟"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"اس کے ساتھ جوڑا بنانے کیلئے:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اس پر ٹائپ کریں:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, پھر واپس جائیں یا انٹر کریں کو دبائیں۔"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اپنے رابطوں اور کال کی سرگزشت تک رسائی کی اجازت دیں"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"منسلک نہیں ہو سکا۔ دوبارہ کوشش کریں۔"</string>
     <string name="device_details_title" msgid="1155622417516195481">"آلہ کی تفصیلات"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"آلے کا بلوٹوتھ پتہ: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"آلے کا بلوٹوتھ پتہ:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"آلہ بھولنا ہے؟"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"وابستگی ہٹائیں"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"ایپ کو غیر منسلک کریں؟"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"ترتیبات کو یاد رکھیں"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"زیادہ سے زیادہ منسلک بلوٹوتھ آڈیو آلات"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"منسلک بلوٹوتھ آڈیو آلات کی زیادہ سے زیادہ تعداد منتخب کریں"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"‏NFC انبار ڈیبگ لاگ"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"‏NFC انبار کا لاگ ان لیول بڑھائیں"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"کاسٹ کریں"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"مرر"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"وائرلیس ڈسپلے فعال کریں"</string>
@@ -2670,8 +2674,8 @@
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"چارجنگ عارضی طور پر محدود ہے"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"آپ کی بیٹری کو محفوظ رکھنے کے لیے۔ مزید جانیں۔"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"چارج کرنا دوبارہ شروع کریں"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"اعلی درجہ حرارت اور چارجنگ کی طویل مدتوں جیسی مخصوص شرائط میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان شرائط کے ختم ہونے پر آپ کا فون عام طور پر خودکار طور پر چارج ہوگا۔"</string>
-    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"اعلی درجہ حرارت اور چارجنگ کی طویل مدتوں جیسی مخصوص شرائط میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان شرائط کے ختم ہونے پر آپ کا ٹیبلیٹ عام طور پر خودکار طور پر چارج ہوگا۔"</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"بہت زیادہ درجہ حرارت اور چارجنگ کی طویل مدتوں جیسے مخصوص حالات میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان حالات کے ختم ہونے پر آپ کا فون نارمل طریقے سے خودکار طور پر چارج ہوگا۔"</string>
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"بہت زیادہ درجہ حرارت اور چارجنگ کی طویل مدتوں جیسے مخصوص حالات میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان حالات کے ختم ہونے پر آپ کا ٹیبلیٹ نارمل طریقے سے خودکار طور پر چارج ہوگا۔"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"کیونکہ آپ نے اپنا فون معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"کیونکہ آپ نے اپنا ٹیبلیٹ معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"کیونکہ آپ نے اپنا آلہ معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index b09da08..36732e8 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Ushbu PIN kodni boshqa qurilmada ham terish lozim bo‘lishi mumkin."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Shuningdek, bu kirish kalitini ikkinchi qurilmada kiritishingiz talab qilinishi mumkin."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;br&gt;&lt;b&gt;bilan biriktirish uchun,&lt;/b&gt;&lt;br&gt;&lt;br&gt;unda mana bu kalit so‘z ko‘rsatilayotganligini tekshiring:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Sozlangan toʻplamga ulanishni tasdiqlang"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>dan so‘rov&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ushbu qurilma bilan biriktirilsinmi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>bilan biriktirish uchun, uni ekranida:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> terib, Return yoki Enter tugmalarini bosing."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontakt va chaqiruvlar tarixiga ruxsat berish"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ulanilmadi. Qaytadan urining."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Qurilma tafsilotlari"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Qurilmaning Bluetooth manzili: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Qurilmaning Bluetooth manzili:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Qurilma unutilsinmi?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Birikmani olib tashlash"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ilova uzilsinmi?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Sozlamalarni eslab qolish"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maksimum ulangan Bluetooth audio qurilmalar"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Maksimum nechta Bluetooth audio qurilma ulash mumkinligi belgilang"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Nfc steklarida uchraydigan nosozliklarni tuzatish jurnali"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Nfc steklarini jurnalga yozish darajasini oshirish"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Translatsiya"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"koʻzgu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Simsiz monitorni yoqish"</string>
@@ -2671,7 +2675,7 @@
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Batareyani koʻp sarflayotgan ilovalar"</string>
     <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Quvvatlash vaqtincha cheklangan"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Batareyangizni asrash uchun. Batafsil."</string>
-    <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Toʻliq quvvatlansin"</string>
+    <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Davom ettirish"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Batareya quvvati yaroqlilik muddatini uzaytirishda yordam berish maqsadida yuqori harorat va uzoq quvvatlash davrlar kabi muayyan shartlarda quvvatlash <xliff:g id="PERCENT">%1$s</xliff:g> gacha cheklanadi.\n\nBu shartlar tugaganda telefoningiz avtomatik ravishda normal quvvat olishni boshlaydi."</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Batareya quvvati yaroqlilik muddatini uzaytirishda yordam berish maqsadida yuqori harorat va uzoq quvvatlash davrlar kabi muayyan shartlarda quvvatlash <xliff:g id="PERCENT">%1$s</xliff:g> gacha cheklanadi.\n\nBu shartlar tugaganda planshetingiz avtomatik ravishda normal quvvat olishni boshlaydi."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Telefonni odatdagidan koʻp ishlatdingiz, baterya quvvati tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflayotgan ilovalar:"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d3dd173..f2f3cd5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Bạn cũng có thể cần nhập mã PIN này trên thiết bị khác."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Bạn cũng có thể cần nhập mã xác nhận này trên thiết bị khác."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Để ghép nối với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Hãy đảm bảo thiết bị đang hiển thị mã xác nhận này:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Xác nhận ghép nối với bộ thiết bị"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Từ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ghép nối với thiết bị này?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Để ghép nối với:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Hãy nhập trên thiết bị:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> rồi nhấn Quay lại hoặc Enter."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Cho phép truy cập vào danh bạ và nhật ký cuộc gọi của bạn"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Không thể kết nối. Hãy thử lại."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Chi tiết thiết bị"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Địa chỉ Bluetooth của thiết bị: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Địa chỉ Bluetooth của thiết bị:\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Xóa thiết bị"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Hủy liên kết"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Ngắt kết nối ứng dụng?"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Nhớ cài đặt"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Chọn số thiết bị âm thanh được kết nối qua Bluetooth tối đa"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Nhật ký gỡ lỗi của ngăn xếp NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Tăng cấp độ ghi nhật ký của ngăn xếp NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Truyền"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"phản chiếu"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Bật hiển thị không dây"</string>
@@ -2669,7 +2673,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Một số tính năng có thể bị hạn chế"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Mức sử dụng pin cao"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Xem các ứng dụng có mức sử dụng pin cao nhất"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Khả năng sạc tạm thời bị hạn chế"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Chức năng sạc tạm thời bị hạn chế"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Để kéo dài tuổi thọ pin. Tìm hiểu thêm."</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Tiếp tục sạc"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Trong một số điều kiện, chẳng hạn như nhiệt độ cao và thời gian sạc lâu, mức sạc có thể bị hạn chế ở <xliff:g id="PERCENT">%1$s</xliff:g> để duy trì độ bền của pin.\n\nKhi các điều kiện đó chấm dứt, điện thoại của bạn sẽ tự động sạc như bình thường."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 898845c..0070c7c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -317,7 +317,7 @@
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"要显示的内容"</string>
     <string name="security_settings_summary" msgid="1627059516127354233">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="2455517905101186330">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
-    <string name="security_passwords_title" msgid="4154420930973818581">"隐私设置"</string>
+    <string name="security_passwords_title" msgid="4154420930973818581">"隐私"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"不可用"</string>
     <string name="security_status_title" msgid="6958004275337618656">"安全状态"</string>
     <string name="security_dashboard_summary" msgid="7571035662779425918">"屏幕锁定、查找我的设备、应用安全性"</string>
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"您可能还需要在另一设备上输入此PIN码。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"您可能还需要在另一台设备上输入此密钥。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"要与以下设备配对：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;请确保其显示的配对密钥为：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"确认与协调组配对"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"来自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要与此设备配对吗？"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"要与 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 设备配对，请在该设备上键入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然后按回车键。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允许访问您的通讯录和通话记录"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"无法连接，请重试。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"设备详细信息"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"设备的蓝牙地址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"设备的蓝牙地址：\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要与该设备取消配对吗？"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"取消关联"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要取消与该应用的关联吗？"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"记住设置"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"已连接蓝牙音频设备的数量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"选择已连接蓝牙音频设备的数量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆栈调试日志"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆栈记录等级"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投射"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"镜像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"开启无线显示"</string>
@@ -2057,7 +2061,7 @@
     <string name="install_text" msgid="4558333621516996473">"安装"</string>
     <string name="disable_text" msgid="5146002260857428005">"停用"</string>
     <string name="enable_text" msgid="8570798764647110430">"启用"</string>
-    <string name="clear_user_data_text" msgid="6773186434260397947">"清除存储空间"</string>
+    <string name="clear_user_data_text" msgid="6773186434260397947">"清空存储空间"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"卸载更新"</string>
     <string name="auto_launch_enable_text" msgid="8912714475823807798">"您已选择的一些活动默认会在此应用中打开。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"您已选择允许该应用创建微件并查看其数据。"</string>
@@ -2269,7 +2273,7 @@
     <string name="usage_time_label" msgid="9105343335151559883">"使用时间"</string>
     <string name="accessibility_settings" msgid="4713215774904704682">"无障碍"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"无障碍设置"</string>
-    <string name="accessibility_settings_summary" msgid="2366627644570558503">"显示屏、互动、音频"</string>
+    <string name="accessibility_settings_summary" msgid="2366627644570558503">"显示、互动、音频"</string>
     <string name="vision_settings_title" msgid="8919983801864103069">"阅读辅助设置"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"您可以根据自己的需求对此设备进行自定义。您可以稍后在“设置”中更改这些无障碍功能的设置。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"更改字体大小"</string>
@@ -3819,7 +3823,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"显示在下拉通知栏、状态栏以及锁定屏幕中"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隐藏状态栏中的无声通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"闪烁指示灯"</string>
-    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隐私设置"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隐私"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"跳过锁定屏幕"</string>
     <string name="lockscreen_bypass_summary" msgid="464277506200346748">"解锁后直接转到上次使用的屏幕"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"锁定屏幕, 锁屏, 跳过, 绕过"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1bb9b08..7a61b68 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"您可能也必須在另一部裝置上輸入這個 PIN 碼。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"您可能也必須在另一部裝置上輸入這個密碼金鑰。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認與協調組合配對"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"來自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這部裝置配對嗎？"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對，請在該裝置上輸入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然後按 Return 或 Enter 鍵。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取您的聯絡人和通話記錄"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"無法連線，請再試一次。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"裝置詳情"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"裝置的藍牙位址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"裝置的藍牙位址：\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要忘記裝置嗎？"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"移除關聯"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要解除連結應用程式嗎？"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"連接藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"選取已連接藍牙音訊裝置的數量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆疊偵錯記錄"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆疊記錄等級"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index af73208..54d2e05 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -827,6 +827,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"你可能也必須在另一個裝置上輸入這個 PIN。"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"你可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"確認與協同組配對"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"來自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這個裝置配對嗎？"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對，請輸入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然後按下 [返回] 或 [輸入]。"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取你的聯絡人和通話記錄"</string>
@@ -860,6 +861,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"無法連線，請再試一次。"</string>
     <string name="device_details_title" msgid="1155622417516195481">"裝置詳細資料"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"裝置的藍牙位址：<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"裝置的藍牙位址：\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"要移除裝置嗎？"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"移除關聯"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"要解除連結應用程式嗎？"</string>
@@ -892,6 +894,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"記住設定"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"已連線藍牙音訊裝置的數量上限"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"選取已連線藍牙音訊裝置的數量上限"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"NFC 堆疊偵錯記錄"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"提高 NFC 堆疊記錄等級"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"投放"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"鏡像"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"啟用無線螢幕分享"</string>
@@ -2669,7 +2673,7 @@
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"部分功能可能受到限制"</string>
     <string name="battery_tip_high_usage_title" msgid="9110720762506146697">"電池用量較高的應用程式"</string>
     <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"查看電池用量最高的應用程式"</string>
-    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"充電功能暫時受到限制"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"已暫時限制充電"</string>
     <string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"這是為了延長電池壽命。瞭解詳情。"</string>
     <string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"繼續充電"</string>
     <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"在高溫和長時間充電等特定情況下，手機可能會將充電量限制在 <xliff:g id="PERCENT">%1$s</xliff:g> 以延長電池壽命。\n\n當上述情況解除後，手機就會自動正常充電。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b74a120..833dd07 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -825,6 +825,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Kungenzeka futhi udinge ukufaka le-PIN kwenye idivaysi."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Kungadingeka ufake lokhiye wokudlula kwenye idivayisi."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Ukuhambisa ngokubili:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Qinisekisa ukuthi ibonisa ukhiye wokungena:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_paring_group_msg" msgid="4609515924670823316">"Qinisekisa ukuze ubhangqe nesethi ehlanganisiwe"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Kusuka ku:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Beka eceleni namanye amadivayisi?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Ukubhangqa ne:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Thayipha kuyona:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, bese ucindezela inkinobho uBuyisela noma uNgena."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Vumela ukufinyelela koxhumana nabo nomlando wekholi"</string>
@@ -858,6 +859,7 @@
     <string name="bluetooth_connect_failed" msgid="7892663424429584925">"Ayikwazanga ukuxhuma. Zama futhi."</string>
     <string name="device_details_title" msgid="1155622417516195481">"Imininingwane yedivayisi"</string>
     <string name="bluetooth_device_mac_address" msgid="4873325074786732703">"Ikheli le-Bluetooth yedivayisi: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Ikheli le-Bluetooth yedivayisi: \n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Khohlwa idivayisi?"</string>
     <string name="remove_association_button" msgid="5004208145998061135">"Susa ukuhambisana"</string>
     <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Nqamula i-App?"</string>
@@ -890,6 +892,8 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Khumbula izilungiselelo"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Amadivayisi omsindo e-Bluetooth axhumekile"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Khetha inombolo enkulu yamadivayisi omsindo we-Bluetooth axhumekile"</string>
+    <string name="nfc_stack_debuglog_title" msgid="2926748386805740609">"Ilogu yokususa iphutha lezitaki ze-NFC"</string>
+    <string name="nfc_stack_debuglog_summary" msgid="7333205107551132121">"Khuphula ileveli yokungena yezitaki ze-NFC"</string>
     <string name="wifi_display_settings_title" msgid="6451625615274960175">"Abalingisi"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"isibuko"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Nika amandla ukubukeka okungenantambo "</string>
@@ -3694,7 +3698,7 @@
     <string name="zen_mode_block_effect_summary_all" msgid="3131918059492425222">"Umsindo, ukudlidliza, nezimpawu zokubuka zezaziso"</string>
     <string name="zen_mode_blocked_effects_footer" msgid="1115914818435434668">"Izaziso ziyadingeka kumsebenzi wefoni ovamile futhi isimo ngeke sifihlwe sanhlobo."</string>
     <string name="zen_mode_no_exceptions" msgid="1580136061336585873">"Lutho"</string>
-    <string name="zen_mode_other_options" msgid="3399967231522580421">"ezinye izinketho"</string>
+    <string name="zen_mode_other_options" msgid="3399967231522580421">"okunye okungakhethwa"</string>
     <string name="zen_mode_add" msgid="8789024026733232566">"Engeza"</string>
     <string name="zen_mode_enable_dialog_turn_on" msgid="1971034397501675078">"Vula"</string>
     <string name="zen_mode_button_turn_on" msgid="6583862599681052347">"Vula manje"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 133b983..fdbe105 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1843,6 +1843,9 @@
     <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
     <string name="bluetooth_confirm_passkey_msg">To pair with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Make sure it is showing this passkey:&lt;br>&lt;b><xliff:g id="passkey">%2$s</xliff:g>&lt;/b></string>
 
+    <!-- Pairing dialog text to remind user the pairing including all of the devices in a coordinated set. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_paring_group_msg">Confirm to pair with the coordinated set</string>
+
     <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
     <string name="bluetooth_incoming_pairing_msg">From:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b>&lt;br>&lt;br>Pair with this device?</string>
 
@@ -1920,6 +1923,8 @@
     <string name="device_details_title">Device details</string>
     <!-- Title of the item to show device MAC address -->
     <string name="bluetooth_device_mac_address">Device\'s Bluetooth address: <xliff:g id="address">%1$s</xliff:g></string>
+    <!-- Title of the items to show multuple devices MAC address [CHAR LIMIT=NONE]-->
+    <string name="bluetooth_multuple_devices_mac_address">Device\'s Bluetooth address:\n<xliff:g id="address">%1$s</xliff:g></string>
     <!-- Bluetooth device details. The title of a confirmation dialog for unpairing a paired device. [CHAR LIMIT=60] -->
     <string name="bluetooth_unpair_dialog_title">Forget device?</string>
     <!-- Content Description for companion device app associations removal button [CHAR LIMIT=28]-->
@@ -1994,6 +1999,11 @@
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
     <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
 
+    <!-- Nfc developer settings: The title of the setting. [CHAR LIMIT=60] -->
+    <string name="nfc_stack_debuglog_title">NFC stack debug log</string>
+    <!-- Nfc developer settings: The description of the setting. -->
+    <string name="nfc_stack_debuglog_summary">Increase NFC stack logging level</string>
+
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
     <!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 6213516..831c190 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -382,6 +382,11 @@
             android:entries="@array/bluetooth_max_connected_audio_devices"
             android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
 
+        <SwitchPreference
+            android:key="nfc_stack_debuglog_enabled"
+            android:title="@string/nfc_stack_debuglog_title"
+            android:summary="@string/nfc_stack_debuglog_summary" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
index 0276bdb..902ff1a 100644
--- a/res/xml/wifi_calling_settings.xml
+++ b/res/xml/wifi_calling_settings.xml
@@ -21,6 +21,7 @@
 
     <com.android.settings.wifi.calling.ListWithEntrySummaryPreference
             android:key="wifi_calling_mode"
+            isPreferenceVisible="false"
             android:title="@string/wifi_calling_mode_title"
             android:summary="@string/wifi_calling_mode_title"
             android:entries="@array/wifi_calling_mode_choices"
@@ -30,6 +31,7 @@
 
     <com.android.settings.wifi.calling.ListWithEntrySummaryPreference
             android:key="wifi_calling_roaming_mode"
+            isPreferenceVisible="false"
             android:title="@string/wifi_calling_roaming_mode_title"
             android:summary="@string/wifi_calling_roaming_mode_summary"
             android:entries="@array/wifi_calling_mode_choices_v2"
@@ -39,7 +41,12 @@
 
     <Preference
             android:key="emergency_address_key"
+            isPreferenceVisible="false"
             android:title="@string/emergency_address_title"
             android:summary="@string/emergency_address_summary" />
 
+    <com.android.settings.wifi.calling.LinkifyDescriptionPreference
+            android:key="no_options_description"
+            isPreferenceVisible="false" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index e89e84b..71eb0f2 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -587,6 +587,7 @@
                 .inflate(com.android.internal.R.layout.transient_notification, null);
         final TextView tv = (TextView) v.findViewById(com.android.internal.R.id.message);
         tv.setText(errorMessage);
+        tv.setSingleLine(false);
 
         final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
         final Configuration config = v.getContext().getResources().getConfiguration();
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 92c2f69..da988f8 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -325,4 +325,6 @@
      * Activity for AppDashboard.
      */
     public static class AppDashboardActivity extends SettingsActivity {}
+
+    public static class AdaptiveBrightnessActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index 7e37e32..38987f5 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -35,6 +35,7 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.applications.ProcStatsData;
+import com.android.settings.datausage.lib.DataUsageLib;
 import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
 import com.android.settingslib.net.DataUsageController;
 
@@ -109,14 +110,8 @@
         if (telephonyManager.isDataCapable()) {
             JSONArray array = new JSONArray();
             for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {
-                telephonyManager = telephonyManager
-                        .createForSubscriptionId(info.getSubscriptionId());
-                String subscriberId = telephonyManager.getSubscriberId();
-                // The null subscriberId means that no any mobile/carrier network will be matched.
-                // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.
-                NetworkTemplate template = subscriberId != null
-                        ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)
-                        : NetworkTemplate.buildTemplateMobileAll(subscriberId);
+                NetworkTemplate template = DataUsageLib.getMobileTemplateForSubId(
+                        telephonyManager, info.getSubscriptionId());
                 final JSONObject usage = dumpDataUsage(template, controller);
                 usage.put("subId", info.getSubscriptionId());
                 array.put(usage);
@@ -125,12 +120,12 @@
         }
         if (packageManager.hasSystemFeature(FEATURE_WIFI)) {
             obj.put("wifi", dumpDataUsage(
-                    NetworkTemplate.buildTemplateWifi(
-                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */), controller));
+                    new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), controller));
         }
 
         if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) {
-            obj.put("ethernet", dumpDataUsage(NetworkTemplate.buildTemplateEthernet(), controller));
+            obj.put("ethernet", dumpDataUsage(new NetworkTemplate.Builder(
+                    NetworkTemplate.MATCH_ETHERNET).build(), controller));
         }
         return obj;
     }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 1a21b55..e485d1e 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -39,7 +39,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.os.HandlerExecutor;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
@@ -324,14 +323,14 @@
 
         mStartTetheringCallback = new OnStartTetheringCallback(this);
         mTetheringEventCallback = new TetheringEventCallback();
-        mTm.registerTetheringEventCallback(new HandlerExecutor(mHandler), mTetheringEventCallback);
+        mTm.registerTetheringEventCallback(r -> mHandler.post(r), mTetheringEventCallback);
 
         mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
         registerReceiver();
 
         mEthernetListener = new EthernetListener();
         if (mEm != null)
-            mEm.addListener(mEthernetListener);
+            mEm.addListener(mEthernetListener, r -> mHandler.post(r));
 
         updateUsbState();
         updateBluetoothAndEthernetState();
diff --git a/src/com/android/settings/accessibility/OWNERS b/src/com/android/settings/accessibility/OWNERS
index ba03055..a0fe42b 100644
--- a/src/com/android/settings/accessibility/OWNERS
+++ b/src/com/android/settings/accessibility/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
+menghanli@google.com
 pweaver@google.com
 zork@google.com
 
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index f321d72..6a254cb 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.appinfo;
 
 import android.content.Context;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.text.format.DateUtils;
@@ -136,13 +137,13 @@
 
     private static NetworkTemplate getTemplate(Context context) {
         if (DataUsageUtils.hasReadyMobileRadio(context)) {
-            return NetworkTemplate.buildTemplateMobileWildcard();
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE).setMeteredness(
+                    NetworkStats.METERED_YES).build();
         }
         if (DataUsageUtils.hasWifiRadio(context)) {
-            return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                    null /* subscriberId */);
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         }
-        return NetworkTemplate.buildTemplateEthernet();
+        return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
index 2f03c3d..763a500 100644
--- a/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
@@ -82,7 +82,7 @@
                         PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
             return UNSUPPORTED_ON_DEVICE;
         }
-        if (!mUserManager.isAdminUser()) {
+        if (mUserManager.isGuestUser()) {
             return DISABLED_FOR_USER;
         }
         if (mNfcAdapter == null) {
diff --git a/src/com/android/settings/biometrics/OWNERS b/src/com/android/settings/biometrics/OWNERS
index 021e89d..99dd654 100644
--- a/src/com/android/settings/biometrics/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,6 +1,10 @@
 # Default reviewers for this and subdirectories.
 curtislb@google.com
+graciecheng@google.com
+ilyamaty@google.com
 jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
 kchyn@google.com
 yukl@google.com
 
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 27d63bf..14c20f1 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -70,9 +70,10 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
-            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.
             // It would show in Available Devices group.
-            if (cachedDevice.isConnectedHearingAidDevice()) {
+            if (cachedDevice.isConnectedHearingAidDevice()
+                    || cachedDevice.isConnectedLeAudioDevice()) {
                 return true;
             }
             // According to the current audio profile type,
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index dda247e..ec3e11f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.content.Context;
 
 import androidx.preference.PreferenceFragmentCompat;
@@ -50,8 +51,17 @@
 
     @Override
     protected void refresh() {
-        mFooterPreference.setTitle(mContext.getString(
+        if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+            StringBuilder title = new StringBuilder(mContext.getString(
+                R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress()));
+            for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) {
+                title.append("\n").append(member.getAddress());
+            }
+            mFooterPreference.setTitle(title);
+        } else {
+            mFooterPreference.setTitle(mContext.getString(
                 R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index ca3dda6..b75e02a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -28,6 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 
@@ -64,6 +65,7 @@
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
     private boolean mPbapAllowed;
+    private boolean mIsCoordinatedSetMember;
 
     /**
      * Creates an instance of a BluetoothPairingController.
@@ -90,6 +92,10 @@
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
+        final CachedBluetoothDevice cachedDevice =
+                mBluetoothManager.getCachedDeviceManager().findDevice(mDevice);
+        mIsCoordinatedSetMember = cachedDevice != null
+                ? cachedDevice.isCoordinatedSetMemberDevice() : false;
     }
 
     @Override
@@ -156,6 +162,15 @@
     }
 
     /**
+     * A method for querying if the bluetooth device is a LE coordinated set member device.
+     *
+     * @return - A boolean indicating if the device is a CSIP supported device.
+     */
+    public boolean isCoordinatedSetMemberDevice() {
+        return mIsCoordinatedSetMember;
+    }
+
+    /**
      * A method for querying if the bluetooth device has a profile already set up on this device.
      *
      * @return - A boolean indicating if the device has previous knowledge of a profile for this
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index d38302d..9e36247 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -344,6 +344,9 @@
             pairingViewContent.setVisibility(View.VISIBLE);
             pairingViewContent.setText(mPairingController.getPairingContent());
         }
+        final TextView messagePairingSet = (TextView) view.findViewById(R.id.pairing_group_message);
+        messagePairingSet.setVisibility(mPairingController.isCoordinatedSetMemberDevice()
+                ? View.VISIBLE : View.GONE);
         return view;
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 993f584..6b80256 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothCsipSetCoordinator;
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.PowerManager;
 import android.os.UserHandle;
+import android.text.TextUtils;
+
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPairingRequest is a receiver for any Bluetooth pairing request. It
@@ -34,36 +38,55 @@
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+        if (action == null) {
             return;
         }
 
-        PowerManager powerManager = context.getSystemService(PowerManager.class);
         BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-        int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
-                BluetoothDevice.ERROR);
-        String deviceAddress = device != null ? device.getAddress() : null;
-        String deviceName = device != null ? device.getName() : null;
-        boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
-                context, deviceAddress, deviceName);
+        final LocalBluetoothManager mBluetoothManager = Utils.getLocalBtManager(context);
+        if (TextUtils.equals(action, BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+            PowerManager powerManager = context.getSystemService(PowerManager.class);
+            int pairingVariant = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
+                    BluetoothDevice.ERROR);
+            String deviceAddress = device != null ? device.getAddress() : null;
+            String deviceName = device != null ? device.getName() : null;
+            boolean shouldShowDialog = LocalBluetoothPreferences.shouldShowDialogInForeground(
+                    context, deviceAddress, deviceName);
 
-        // Skips consent pairing dialog if the device was recently associated with CDM
-        if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
-                && device.canBondWithoutDialog()) {
-            device.setPairingConfirmation(true);
-        } else if (powerManager.isInteractive() && shouldShowDialog) {
-            // Since the screen is on and the BT-related activity is in the foreground,
-            // just open the dialog
-            // convert broadcast intent into activity intent (same action string)
-            Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent,
-                    BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
+            // Skips consent pairing dialog if the device was recently associated with CDM
+            if (pairingVariant == BluetoothDevice.PAIRING_VARIANT_CONSENT
+                    && (device.canBondWithoutDialog()
+                    || mBluetoothManager.getCachedDeviceManager().isOngoingPairByCsip(device))) {
+                device.setPairingConfirmation(true);
+            } else if (powerManager.isInteractive() && shouldShowDialog) {
+                // Since the screen is on and the BT-related activity is in the foreground,
+                // just open the dialog
+                // convert broadcast intent into activity intent (same action string)
+                Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context,
+                        intent, BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
 
-            context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
-        } else {
-            // Put up a notification that leads to the dialog
-            intent.setClass(context, BluetoothPairingService.class);
-            intent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
-            context.startServiceAsUser(intent, UserHandle.CURRENT);
+                context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
+            } else {
+                // Put up a notification that leads to the dialog
+                intent.setClass(context, BluetoothPairingService.class);
+                intent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
+                context.startServiceAsUser(intent, UserHandle.CURRENT);
+            }
+        } else if (TextUtils.equals(action,
+                BluetoothCsipSetCoordinator.ACTION_CSIS_SET_MEMBER_AVAILABLE)) {
+            if (device == null) {
+                return;
+            }
+
+            final int groupId = intent.getIntExtra(BluetoothCsipSetCoordinator.EXTRA_CSIS_GROUP_ID,
+                    BluetoothCsipSetCoordinator.GROUP_ID_INVALID);
+            if (groupId == BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+                return;
+            }
+
+            if (mBluetoothManager.getCachedDeviceManager().shouldPairByCsip(device, groupId)) {
+                device.createBond(BluetoothDevice.TRANSPORT_LE);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index fc1b9b7..d1c45b6 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -70,9 +70,10 @@
             if (DBG) {
                 Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);
             }
-            // If device is Hearing Aid, it is compatible with HFP and A2DP.
+            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.
             // It would not show in Connected Devices group.
-            if (cachedDevice.isConnectedHearingAidDevice()) {
+            if (cachedDevice.isConnectedHearingAidDevice()
+                    || cachedDevice.isConnectedLeAudioDevice()) {
                 return false;
             }
             // According to the current audio profile type,
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 602b79b..e8adac0 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -107,6 +107,8 @@
     @Override
     public void onStart() {
         super.onStart();
+        mLocalManager.getCachedDeviceManager().clearNonBondedDevices();
+        removeAllDevices();
         addCachedDevices();
         mSelectedDevice = null;
         if (mScanAllowed) {
diff --git a/src/com/android/settings/bluetooth/OWNERS b/src/com/android/settings/bluetooth/OWNERS
index 5e716e1..52017a8 100644
--- a/src/com/android/settings/bluetooth/OWNERS
+++ b/src/com/android/settings/bluetooth/OWNERS
@@ -2,5 +2,6 @@
 hughchen@google.com
 timhypeng@google.com
 siyuanh@google.com
+robertluo@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index dab4f23..f5bc279 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -65,7 +65,7 @@
             removePreferenceIfNecessary(bluetoothDevices, cachedManager);
             for (BluetoothDevice device : bluetoothDevices) {
                 final CachedBluetoothDevice cachedDevice = cachedManager.findDevice(device);
-                if (cachedDevice != null) {
+                if (cachedDevice != null && !cachedManager.isSubDevice(device)) {
                     update(cachedDevice);
                 }
             }
diff --git a/src/com/android/settings/connecteddevice/OWNERS b/src/com/android/settings/connecteddevice/OWNERS
new file mode 100644
index 0000000..a5fe957
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/OWNERS
@@ -0,0 +1,6 @@
+# Default reviewers for this and subdirectories.
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/connecteddevice/usb/OWNERS b/src/com/android/settings/connecteddevice/usb/OWNERS
index add985c..66bf468 100644
--- a/src/com/android/settings/connecteddevice/usb/OWNERS
+++ b/src/com/android/settings/connecteddevice/usb/OWNERS
@@ -1,3 +1,6 @@
 # Default reviewers for this and subdirectories.
 zhangjerry@google.com
 badhri@google.com
+hughchen@google.com
+timhypeng@google.com
+robertluo@google.com
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 244818f..7f3a598 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -41,7 +41,10 @@
  */
 public class UsbBackend {
 
-    static final int PD_ROLE_SWAP_TIMEOUT_MS = 3000;
+    // extend this value from 3s to 4s because of switching data role
+    // in USB driver side takes about 3s in some devices, plus the usb
+    // port change event dispatching time, 3s is not enough.
+    static final int PD_ROLE_SWAP_TIMEOUT_MS = 4000;
     static final int NONPD_ROLE_SWAP_TIMEOUT_MS = 15000;
 
     private final boolean mFileTransferRestricted;
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 1adf199..70852fe 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -84,6 +84,7 @@
 import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
 import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
 import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
+import com.android.settings.display.AutoBrightnessSettings;
 import com.android.settings.display.NightDisplaySettings;
 import com.android.settings.display.SmartAutoRotatePreferenceFragment;
 import com.android.settings.display.darkmode.DarkModeSettingsFragment;
@@ -317,7 +318,8 @@
             MediaControlsSettings.class.getName(),
             NetworkProviderSettings.class.getName(),
             AlarmsAndRemindersDetails.class.getName(),
-            MediaManagementAppsDetails.class.getName()
+            MediaManagementAppsDetails.class.getName(),
+            AutoBrightnessSettings.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -348,6 +350,8 @@
             Settings.ConfigureNotificationSettingsActivity.class.getName(),
             Settings.ManageApplicationsActivity.class.getName(),
             Settings.PaymentSettingsActivity.class.getName(),
+            // Home page > Display
+            Settings.AdaptiveBrightnessActivity.class.getName(),
             // Home page > Security & screen lock
             Settings.LocationSettingsActivity.class.getName(),
             // Home page > System
diff --git a/src/com/android/settings/datausage/BillingCyclePreferenceController.java b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
index 2f144cb..9592c5e 100644
--- a/src/com/android/settings/datausage/BillingCyclePreferenceController.java
+++ b/src/com/android/settings/datausage/BillingCyclePreferenceController.java
@@ -17,7 +17,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.INetworkManagementService;
@@ -51,8 +50,6 @@
         TemplatePreference.NetworkServices services = new TemplatePreference.NetworkServices();
         services.mNetworkService = INetworkManagementService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
-        services.mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         services.mPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);
         services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
         services.mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 0577e9c..12fb03b 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -17,13 +17,13 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
-import android.net.TrafficStats;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
+import android.util.DataUnit;
 import android.util.SparseIntArray;
 
 import androidx.annotation.VisibleForTesting;
@@ -46,7 +46,7 @@
 
     // The resolution we show on the graph so that we can squash things down to ints.
     // Set to half a meg for now.
-    private static final long RESOLUTION = TrafficStats.MB_IN_BYTES / 2;
+    private static final long RESOLUTION = DataUnit.MEBIBYTES.toBytes(1) / 2;
 
     private final int mWarningColor;
     private final int mLimitColor;
diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index 74d27be..1292d00 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -13,14 +13,17 @@
  */
 package com.android.settings.datausage;
 
+import android.annotation.NonNull;
+import android.app.usage.NetworkStats;
 import android.content.Context;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
-import android.net.NetworkStatsHistory;
 import android.text.format.DateUtils;
 import android.util.Pair;
+import android.util.Range;
 import android.widget.AdapterView;
 
+import com.android.net.module.util.NetworkStatsUtils;
 import com.android.settings.Utils;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.NetworkCycleData;
@@ -62,9 +65,43 @@
         return 0;
     }
 
+    protected static long getTotalBytesForTimeRange(List<NetworkStats.Bucket> stats,
+            Range<Long> range) {
+        long bytes = 0L;
+        for (NetworkStats.Bucket bucket : stats) {
+            final Range<Long> bucketSpan = new Range<>(
+                    bucket.getStartTimeStamp(), bucket.getEndTimeStamp());
+            // Only record bytes that overlapped with the given time range. For partially
+            // overlapped bucket, record rational bytes assuming the traffic is uniform
+            // distributed within the bucket.
+            try {
+                final Range<Long> overlapped = range.intersect(bucketSpan);
+                final long totalOfBucket = bucket.getRxBytes() + bucket.getTxBytes();
+                bytes += NetworkStatsUtils.multiplySafeByRational(totalOfBucket,
+                        overlapped.getUpper() - overlapped.getLower(),
+                        bucketSpan.getUpper() - bucketSpan.getLower());
+            } catch (IllegalArgumentException e) {
+                // Range disjoint, ignore.
+                continue;
+            }
+        }
+        return bytes;
+    }
+
+    @NonNull
+    private Range getTimeRangeOf(@NonNull List<NetworkStats.Bucket> stats) {
+        long start = Long.MAX_VALUE;
+        long end = Long.MIN_VALUE;
+        for (NetworkStats.Bucket bucket : stats) {
+            start = Math.min(start, bucket.getStartTimeStamp());
+            end = Math.max(end, bucket.getEndTimeStamp());
+        }
+        return new Range(start, end);
+    }
+
     /**
      * Rebuild list based on {@link NetworkPolicy} and available
-     * {@link NetworkStatsHistory} data. Always selects the newest item,
+     * {@link List<NetworkStats.Bucket>} data. Always selects the newest item,
      * updating the inspection range on chartData.
      */
     @Deprecated
@@ -75,19 +112,20 @@
         clear();
 
         final Context context = getContext();
-        NetworkStatsHistory.Entry entry = null;
 
-        long historyStart = Long.MAX_VALUE;
-        long historyEnd = Long.MIN_VALUE;
-        if (chartData != null) {
-            historyStart = chartData.network.getStart();
-            historyEnd = chartData.network.getEnd();
+        long historyStart;
+        long historyEnd;
+        try {
+            final Range<Long> historyTimeRange = getTimeRangeOf(chartData.network);
+            historyStart = historyTimeRange.getLower();
+            historyEnd = historyTimeRange.getUpper();
+        } catch (IllegalArgumentException e) {
+            // Empty history.
+            final long now = System.currentTimeMillis();
+            historyStart = now;
+            historyEnd = now + 1;
         }
 
-        final long now = System.currentTimeMillis();
-        if (historyStart == Long.MAX_VALUE) historyStart = now;
-        if (historyEnd == Long.MIN_VALUE) historyEnd = now + 1;
-
         boolean hasCycles = false;
         if (policy != null) {
             final Iterator<Pair<ZonedDateTime, ZonedDateTime>> it = NetworkPolicyManager
@@ -99,8 +137,9 @@
 
                 final boolean includeCycle;
                 if (chartData != null) {
-                    entry = chartData.network.getValues(cycleStart, cycleEnd, entry);
-                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                    final long bytesInCycle = getTotalBytesForTimeRange(chartData.network,
+                            new Range<>(cycleStart, cycleEnd));
+                    includeCycle = bytesInCycle > 0;
                 } else {
                     includeCycle = true;
                 }
@@ -120,8 +159,9 @@
 
                 final boolean includeCycle;
                 if (chartData != null) {
-                    entry = chartData.network.getValues(cycleStart, cycleEnd, entry);
-                    includeCycle = (entry.rxBytes + entry.txBytes) > 0;
+                    final long bytesInCycle = getTotalBytesForTimeRange(chartData.network,
+                            new Range<>(cycleStart, cycleEnd));
+                    includeCycle = bytesInCycle > 0;
                 } else {
                     includeCycle = true;
                 }
diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java
index 299ce43..eee3228 100644
--- a/src/com/android/settings/datausage/DataUsageBaseFragment.java
+++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java
@@ -15,7 +15,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.os.Bundle;
@@ -44,8 +43,6 @@
 
         services.mNetworkService = INetworkManagementService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
-        services.mStatsService = INetworkStatsService.Stub.asInterface(
-                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         services.mPolicyManager = (NetworkPolicyManager) context
                 .getSystemService(Context.NETWORK_POLICY_SERVICE);
 
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index f72a006..200a888 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -14,11 +14,9 @@
 
 package com.android.settings.datausage;
 
+import static android.app.usage.NetworkStats.Bucket.UID_REMOVED;
+import static android.app.usage.NetworkStats.Bucket.UID_TETHERING;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
-import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
-import static android.net.TrafficStats.UID_REMOVED;
-import static android.net.TrafficStats.UID_TETHERING;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -91,7 +89,6 @@
     private static final String KEY_APPS_GROUP = "apps_group";
     private static final String KEY_TEMPLATE = "template";
     private static final String KEY_APP = "app";
-    private static final String KEY_FIELDS = "fields";
 
     @VisibleForTesting
     static final int LOADER_CHART_DATA = 2;
@@ -304,7 +301,6 @@
         final Bundle args = new Bundle();
         args.putParcelable(KEY_TEMPLATE, template);
         args.putParcelable(KEY_APP, null);
-        args.putInt(KEY_FIELDS, FIELD_RX_BYTES | FIELD_TX_BYTES);
         return args;
     }
 
diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java
index 644ea9b..0ed0ad3 100644
--- a/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/src/com/android/settings/datausage/DataUsagePreference.java
@@ -53,7 +53,7 @@
         mTemplate = template;
         mSubId = subId;
         final DataUsageController controller = getDataUsageController();
-        if (mTemplate.isMatchRuleMobile()) {
+        if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
             setTitle(R.string.app_cellular_data_usage);
         } else {
             final DataUsageController.DataUsageInfo usageInfo =
@@ -78,13 +78,14 @@
         final SubSettingLauncher launcher;
         args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
         args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
-        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
-            ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
+        args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.getMatchRule()
+                == NetworkTemplate.MATCH_MOBILE
+                ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
         launcher = new SubSettingLauncher(getContext())
             .setArguments(args)
             .setDestination(DataUsageList.class.getName())
             .setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN);
-        if (mTemplate.isMatchRuleMobile()) {
+        if (mTemplate.getMatchRule() == NetworkTemplate.MATCH_MOBILE) {
             launcher.setTitleRes(R.string.app_cellular_data_usage);
         } else {
             launcher.setTitleRes(mTitleRes);
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index a4396a2..abcc45f 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -183,15 +183,15 @@
     void addWifiSection() {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_wifi);
-        category.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0, services);
+        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(),
+                0, services);
     }
 
     private void addEthernetSection() {
         TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                 inflatePreferences(R.xml.data_usage_ethernet);
-        category.setTemplate(NetworkTemplate.buildTemplateEthernet(), 0, services);
+        category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(),
+                0, services);
     }
 
     private Preference inflatePreferences(int resId) {
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 260a6da..b6e533b 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -225,8 +225,7 @@
     static void launchWifiDataUsage(Context context) {
         final Bundle args = new Bundle(1);
         args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
         final SubSettingLauncher launcher = new SubSettingLauncher(context)
                 .setArguments(args)
@@ -369,8 +368,7 @@
     protected long getHistoricalUsageLevel() {
         final DataUsageController controller = new DataUsageController(getContext());
         return controller.getHistoricalUsageLevel(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index ac1e1ad..1b3b47a 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -138,8 +138,7 @@
             mDefaultTemplate = DataUsageLib.getMobileTemplate(context, subscriptionId);
         } else if (DataUsageUtils.hasWifiRadio(context)) {
             mDataUsageTemplate = R.string.wifi_data_template;
-            mDefaultTemplate = NetworkTemplate.buildTemplateWifi(
-                    NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);
+            mDefaultTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         } else {
             mDataUsageTemplate = R.string.ethernet_data_template;
             mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, subscriptionId);
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index fae53ec..5227284 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -184,10 +184,9 @@
         if (SubscriptionManager.isValidSubscriptionId(defaultSubId) && hasMobileData(context)) {
             return DataUsageLib.getMobileTemplate(context, defaultSubId);
         } else if (hasWifiRadio(context)) {
-            return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                    null /* subscriberId */);
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         } else {
-            return NetworkTemplate.buildTemplateEthernet();
+            return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();
         }
     }
 
diff --git a/src/com/android/settings/datausage/TemplatePreference.java b/src/com/android/settings/datausage/TemplatePreference.java
index 158c3b6..43dda0a 100644
--- a/src/com/android/settings/datausage/TemplatePreference.java
+++ b/src/com/android/settings/datausage/TemplatePreference.java
@@ -14,7 +14,6 @@
 
 package com.android.settings.datausage;
 
-import android.net.INetworkStatsService;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.INetworkManagementService;
@@ -30,7 +29,6 @@
 
     class NetworkServices {
         INetworkManagementService mNetworkService;
-        INetworkStatsService mStatsService;
         NetworkPolicyManager mPolicyManager;
         TelephonyManager mTelephonyManager;
         SubscriptionManager mSubscriptionManager;
diff --git a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
index 0551fc2..9d3054e 100644
--- a/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceController.java
@@ -26,6 +26,8 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.net.DataUsageController;
 
+import java.util.Set;
+
 /**
  * The controller displays a data usage chart for the specified Wi-Fi network.
  */
@@ -52,7 +54,8 @@
         final DataUsageSummaryPreference mPreference = (DataUsageSummaryPreference) preference;
         // TODO(b/126299427): Currently gets data usage of whole Wi-Fi networks, but should get
         //  specified one.
-        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(mNetworkId);
+        final NetworkTemplate template = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI)
+                .setWifiNetworkKeys(Set.of(mNetworkId)).build();
         final DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                 template);
         mDataInfoController.updateDataLimit(info, mPolicyEditor.getPolicy(template));
diff --git a/src/com/android/settings/datausage/lib/DataUsageLib.java b/src/com/android/settings/datausage/lib/DataUsageLib.java
index 830f1ca..1ca5eff 100644
--- a/src/com/android/settings/datausage/lib/DataUsageLib.java
+++ b/src/com/android/settings/datausage/lib/DataUsageLib.java
@@ -17,15 +17,19 @@
 package com.android.settings.datausage.lib;
 
 import android.content.Context;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.android.internal.util.ArrayUtils;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * Lib class for data usage
@@ -68,15 +72,37 @@
             return mobileTemplate;
         }
 
-        return NetworkTemplate.normalize(mobileTemplate, mergedSubscriberIds);
+        return normalizeMobileTemplate(mobileTemplate, mergedSubscriberIds);
     }
 
-    private static NetworkTemplate getMobileTemplateForSubId(
+    private static NetworkTemplate normalizeMobileTemplate(
+            @NonNull NetworkTemplate template, @NonNull String[] mergedSet) {
+        if (template.getSubscriberIds().isEmpty()) return template;
+        // The input template should have at most 1 subscriberId.
+        final String subscriberId = template.getSubscriberIds().iterator().next();
+
+        if (Set.of(mergedSet).contains(subscriberId)) {
+            // Requested template subscriber is part of the merge group; return
+            // a template that matches all merged subscribers.
+            return new NetworkTemplate.Builder(template.getMatchRule())
+                    .setSubscriberIds(Set.of(mergedSet))
+                    .setMeteredness(template.getMeteredness()).build();
+        }
+
+        return template;
+    }
+
+    public static NetworkTemplate getMobileTemplateForSubId(
             TelephonyManager telephonyManager, int subId) {
-        // The null subscriberId means that no any mobile/carrier network will be matched.
-        // Using old API: buildTemplateMobileAll for the null subscriberId to avoid NPE.
+        // Create template that matches any mobile network when the subscriberId is null.
         String subscriberId = telephonyManager.getSubscriberId(subId);
-        return subscriberId != null ? NetworkTemplate.buildTemplateCarrierMetered(subscriberId)
-                : NetworkTemplate.buildTemplateMobileAll(subscriberId);
+        return subscriberId != null
+                ? new NetworkTemplate.Builder(NetworkTemplate.MATCH_CARRIER)
+                .setSubscriberIds(Set.of(subscriberId))
+                .setMeteredness(NetworkStats.METERED_YES)
+                .build()
+                : new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                        .setMeteredness(NetworkStats.METERED_YES)
+                        .build();
     }
 }
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index 7ad770a..b61f975 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,6 +1,6 @@
 # Default reviewers for this and subdirectories.
 vichang@google.com
-nfuller@google.com
+mingaleev@google.com
 
 # Emergency approvers in case the above are not available
 narayan@google.com
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
index f74614d..f9e819c 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
@@ -151,7 +151,7 @@
         public TimeZoneInfo format(TimeZone timeZone) {
             String canonicalZoneId = getCanonicalZoneId(timeZone);
             final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
-            final java.util.TimeZone javaTimeZone = java.util.TimeZone.getTimeZone(canonicalZoneId);
+            final java.util.TimeZone javaTimeZone = toJavaTimeZone(canonicalZoneId);
             final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
                 javaTimeZone, mNow);
             return new TimeZoneInfo.Builder(timeZone)
@@ -165,15 +165,24 @@
                     .setGmtOffset(gmtOffset)
                     .build();
         }
+    }
 
-        private static String getCanonicalZoneId(TimeZone timeZone) {
-            final String id = timeZone.getID();
-            final String canonicalId = TimeZone.getCanonicalID(id);
-            if (canonicalId != null) {
-                return canonicalId;
-            }
-            return id;
+    /* package-private */ java.util.TimeZone getJavaTimeZone() {
+        String canonicalZoneId = getCanonicalZoneId(mTimeZone);
+        return toJavaTimeZone(canonicalZoneId);
+    }
+
+    private static java.util.TimeZone toJavaTimeZone(String canonicalZoneId) {
+        return java.util.TimeZone.getTimeZone(canonicalZoneId);
+    }
+
+    private static String getCanonicalZoneId(TimeZone timeZone) {
+        final String id = timeZone.getID();
+        final String canonicalId = TimeZone.getCanonicalID(id);
+        if (canonicalId != null) {
+            return canonicalId;
         }
+        return id;
     }
 
 }
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index 80cefb6..c6ac328 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -20,17 +20,17 @@
 import android.icu.text.DateFormat;
 import android.icu.text.DisplayContext;
 import android.icu.text.SimpleDateFormat;
-import android.icu.util.BasicTimeZone;
 import android.icu.util.Calendar;
 import android.icu.util.TimeZone;
-import android.icu.util.TimeZoneTransition;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
+import java.time.Instant;
+import java.time.zone.ZoneOffsetTransition;
+import java.time.zone.ZoneRules;
 import java.util.Date;
 
 public class TimeZoneInfoPreferenceController extends BasePreferenceController {
@@ -86,11 +86,11 @@
             return mContext.getString(R.string.zone_info_footer_no_dst, offsetAndName);
         }
 
-        final TimeZoneTransition nextDstTransition = findNextDstTransition(timeZone);
-        if (nextDstTransition == null) {
-            return null;
+        final ZoneOffsetTransition nextDstTransition = findNextDstTransition(item);
+        if (nextDstTransition == null) { // No future transition
+            return mContext.getString(R.string.zone_info_footer_no_dst, offsetAndName);
         }
-        final boolean toDst = nextDstTransition.getTo().getDSTSavings() != 0;
+        final boolean toDst = getDSTSavings(timeZone, nextDstTransition.getInstant()) != 0;
         String timeType = toDst ? item.getDaylightName() : item.getStandardName();
         if (timeType == null) {
             // Fall back to generic "summer time" and "standard time" if the time zone has no
@@ -101,26 +101,37 @@
 
         }
         final Calendar transitionTime = Calendar.getInstance(timeZone);
-        transitionTime.setTimeInMillis(nextDstTransition.getTime());
+        transitionTime.setTimeInMillis(nextDstTransition.getInstant().toEpochMilli());
         final String date = mDateFormat.format(transitionTime);
         return SpannableUtil.getResourcesText(mContext.getResources(),
                 R.string.zone_info_footer, offsetAndName, timeType, date);
     }
 
-    private TimeZoneTransition findNextDstTransition(TimeZone timeZone) {
-        if (!(timeZone instanceof BasicTimeZone)) {
-            return null;
-        }
-        final BasicTimeZone basicTimeZone = (BasicTimeZone) timeZone;
-        TimeZoneTransition transition = basicTimeZone.getNextTransition(
-                mDate.getTime(), /* inclusive */ false);
-        do {
-            if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) {
+    private ZoneOffsetTransition findNextDstTransition(TimeZoneInfo timeZoneInfo) {
+        TimeZone timeZone = timeZoneInfo.getTimeZone();
+        ZoneRules zoneRules = timeZoneInfo.getJavaTimeZone().toZoneId().getRules();
+
+        Instant from = mDate.toInstant();
+
+        ZoneOffsetTransition transition;
+        while (true) { // Find next transition with different DST offsets
+            transition = zoneRules.nextTransition(from);
+            if (transition == null) {
                 break;
             }
-            transition = basicTimeZone.getNextTransition(
-                    transition.getTime(), /*inclusive */ false);
-        } while (transition != null);
+            Instant to = transition.getInstant();
+            if (getDSTSavings(timeZone, from) != getDSTSavings(timeZone, to)) {
+                break;
+            }
+            from = to;
+        }
+
         return transition;
     }
+
+    private static int getDSTSavings(TimeZone timeZone, Instant instant) {
+        int[] offsets = new int[2];
+        timeZone.getOffset(instant.toEpochMilli(), false /* local time */, offsets);
+        return offsets[1];
+    }
 }
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
index 88dda29..7514577 100644
--- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -17,9 +17,12 @@
 package com.android.settings.development;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.annotation.VisibleForTesting;
@@ -34,6 +37,8 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.List;
+
 public abstract class AbstractBluetoothA2dpPreferenceController extends
         DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
         PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver,
@@ -48,11 +53,15 @@
     private final String[] mListValues;
     private final String[] mListSummaries;
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     public AbstractBluetoothA2dpPreferenceController(Context context, Lifecycle lifecycle,
             BluetoothA2dpConfigStore store) {
         super(context);
 
         mBluetoothA2dpConfigStore = store;
+        mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
         mListValues = getListValues();
         mListSummaries = getListSummaries();
 
@@ -82,13 +91,11 @@
 
         final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
         synchronized (mBluetoothA2dpConfigStore) {
-            if (mBluetoothA2dp != null) {
-                BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
-                if (activeDevice == null) {
-                    return false;
-                }
-                setCodecConfigPreference(activeDevice, codecConfig);
+            BluetoothDevice activeDevice = getA2dpActiveDevice();
+            if (activeDevice == null) {
+                return false;
             }
+            setCodecConfigPreference(activeDevice, codecConfig);
         }
         // Because the setting is not persisted into permanent storage, we cannot call update state
         // here to update the preference.
@@ -106,7 +113,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null || getCodecConfig(activeDevice) == null || mPreference == null) {
             return;
         }
@@ -184,7 +191,7 @@
     void setCodecConfigPreference(BluetoothDevice device,
             BluetoothCodecConfig config) {
         BluetoothDevice bluetoothDevice =
-                (device != null) ? device : mBluetoothA2dp.getActiveDevice();
+                (device != null) ? device : getA2dpActiveDevice();
         if (bluetoothDevice == null) {
             return;
         }
@@ -195,7 +202,7 @@
     BluetoothCodecConfig getCodecConfig(BluetoothDevice device) {
         if (mBluetoothA2dp != null) {
             BluetoothDevice bluetoothDevice =
-                    (device != null) ? device : mBluetoothA2dp.getActiveDevice();
+                    (device != null) ? device : getA2dpActiveDevice();
             if (bluetoothDevice == null) {
                 return null;
             }
@@ -206,4 +213,13 @@
         }
         return null;
     }
+
+    private BluetoothDevice getA2dpActiveDevice() {
+        if (mBluetoothAdapter == null) {
+            return null;
+        }
+        List<BluetoothDevice> activeDevices =
+                mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP);
+        return (activeDevices.size() > 0) ? activeDevices.get(0) : null;
+    }
 }
diff --git a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
index b9c2d43..3aa92f1 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsFingerprintController.java
@@ -73,7 +73,7 @@
         final CharSequence titleFormat = mContext.getText(
                 R.string.adb_device_fingerprint_title_format);
         mFingerprintPref.setTitle(String.format(
-                titleFormat.toString(), mPairedDevice.getGuid()));
+                titleFormat.toString(), mPairedDevice.guid));
         mFingerprintCategory.addPreference(mFingerprintPref);
     }
 }
diff --git a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
index a4e79ea..7830bb9 100644
--- a/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
+++ b/src/com/android/settings/development/AdbDeviceDetailsHeaderController.java
@@ -81,7 +81,7 @@
 
         mEntityHeaderController
                 .setIcon(mContext.getDrawable(com.android.internal.R.drawable.ic_bt_laptop))
-                .setLabel(mPairedDevice.getDeviceName())
+                .setLabel(mPairedDevice.name)
                 .done(mFragment.getActivity(), true);
     }
 }
diff --git a/src/com/android/settings/development/AdbPairedDevicePreference.java b/src/com/android/settings/development/AdbPairedDevicePreference.java
index a82a949..5d30428 100644
--- a/src/com/android/settings/development/AdbPairedDevicePreference.java
+++ b/src/com/android/settings/development/AdbPairedDevicePreference.java
@@ -77,8 +77,8 @@
 
     static void setTitle(AdbPairedDevicePreference preference,
                          PairDevice pairedDevice) {
-        preference.setTitle(pairedDevice.getDeviceName());
-        preference.setSummary(pairedDevice.isConnected()
+        preference.setTitle(pairedDevice.name);
+        preference.setSummary(pairedDevice.connected
                 ? preference.getContext().getText(R.string.adb_wireless_device_connected_summary)
                 : "");
     }
diff --git a/src/com/android/settings/development/BluetoothA2dpConfigStore.java b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
index 0b154d2..7fd7b13 100644
--- a/src/com/android/settings/development/BluetoothA2dpConfigStore.java
+++ b/src/com/android/settings/development/BluetoothA2dpConfigStore.java
@@ -71,10 +71,16 @@
     }
 
     public BluetoothCodecConfig createCodecConfig() {
-        return new BluetoothCodecConfig(mCodecType, mCodecPriority,
-                mSampleRate, mBitsPerSample,
-                mChannelMode, mCodecSpecific1Value,
-                mCodecSpecific2Value, mCodecSpecific3Value,
-                mCodecSpecific4Value);
+        return new BluetoothCodecConfig.Builder()
+                .setCodecType(mCodecType)
+                .setCodecPriority(mCodecPriority)
+                .setSampleRate(mSampleRate)
+                .setBitsPerSample(mBitsPerSample)
+                .setChannelMode(mChannelMode)
+                .setCodecSpecific1(mCodecSpecific1Value)
+                .setCodecSpecific2(mCodecSpecific2Value)
+                .setCodecSpecific3(mCodecSpecific3Value)
+                .setCodecSpecific4(mCodecSpecific4Value)
+                .build();
     }
 }
diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index ee6af1c..bd8169a 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -17,6 +17,8 @@
 package com.android.settings.development;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.SystemProperties;
 
 import androidx.annotation.VisibleForTesting;
@@ -38,12 +40,20 @@
     static final String MAX_CONNECTED_AUDIO_DEVICES_PROPERTY =
             "persist.bluetooth.maxconnectedaudiodevices";
 
-    private final int mDefaultMaxConnectedAudioDevices;
+    private int mDefaultMaxConnectedAudioDevices = 0;
 
     public BluetoothMaxConnectedAudioDevicesPreferenceController(Context context) {
         super(context);
-        mDefaultMaxConnectedAudioDevices = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
+
+        try {
+            Resources res = context.getPackageManager().getResourcesForApplication(
+                    "com.android.bluetooth");
+            mDefaultMaxConnectedAudioDevices = res.getInteger(res.getIdentifier(
+                    "config_bluetooth_max_connected_audio_devices",
+                    "integer", "com.android.bluetooth"));
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index fbab1fd..94b67aa 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -515,6 +515,7 @@
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
+        controllers.add(new NfcStackDebugLogPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java
new file mode 100644
index 0000000..a3cab25
--- /dev/null
+++ b/src/com/android/settings/development/NfcStackDebugLogPreferenceController.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class NfcStackDebugLogPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String NFC_STACK_DEBUGLOG_ENABLED_KEY =
+            "nfc_stack_debuglog_enabled";
+    @VisibleForTesting
+    static final String NFC_STACK_DEBUGLOG_ENABLED_PROPERTY =
+            "persist.nfc.debug_enabled";
+
+    public NfcStackDebugLogPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return NFC_STACK_DEBUGLOG_ENABLED_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        try {
+            SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                    isEnabled ? "true" : "false");
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        try {
+            final boolean isEnabled = SystemProperties.getBoolean(
+                    NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+            ((SwitchPreference) mPreference).setChecked(isEnabled);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to get nfc system property: " + e.getMessage());
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        try {
+            SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, "false");
+            ((SwitchPreference) mPreference).setChecked(false);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
+        }
+    }
+}
diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java
index 47d4e52..fecdbfa 100644
--- a/src/com/android/settings/development/WirelessDebuggingFragment.java
+++ b/src/com/android/settings/development/WirelessDebuggingFragment.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.debug.AdbManager;
+import android.debug.FingerprintAndPairDevice;
 import android.debug.IAdbManager;
 import android.debug.PairDevice;
 import android.os.Build;
@@ -314,8 +315,12 @@
             mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(
                     Context.ADB_SERVICE));
             try {
-                Map<String, PairDevice> newList = mAdbManager.getPairedDevices();
-                updatePairedDevicePreferences(newList);
+                FingerprintAndPairDevice[] newList = mAdbManager.getPairedDevices();
+                Map<String, PairDevice> newMap = new HashMap<>();
+                for (FingerprintAndPairDevice pair : newList) {
+                    newMap.put(pair.keyFingerprint, pair.device);
+                }
+                updatePairedDevicePreferences(newMap);
                 mConnectionPort = mAdbManager.getAdbWirelessPort();
                 if (mConnectionPort > 0) {
                     Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort);
@@ -434,7 +439,7 @@
             case FORGET_ACTION:
                 try {
                     p = (PairDevice) data.getParcelableExtra(PAIRED_DEVICE_EXTRA);
-                    mAdbManager.unpairDevice(p.getGuid());
+                    mAdbManager.unpairDevice(p.guid);
                 } catch (RemoteException e) {
                     Log.e(TAG, "Unable to forget the device");
                 }
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index d66b8d8..62bcffb 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -30,6 +30,8 @@
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.List;
+
 /**
  * Abstract class for Bluetooth A2DP config dialog controller in developer option.
  */
@@ -82,7 +84,7 @@
         }
         writeConfigurationValues(index);
         final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice != null) {
             bluetoothA2dp.setCodecConfigPreference(activeDevice, codecConfig);
         }
@@ -151,7 +153,7 @@
         if (bluetoothA2dp == null) {
             return null;
         }
-        BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get current codec config. No active device.");
             return null;
@@ -170,13 +172,13 @@
      *
      * @return Array of {@link BluetoothCodecConfig}.
      */
-    protected BluetoothCodecConfig[] getSelectableConfigs(BluetoothDevice device) {
+    protected List<BluetoothCodecConfig> getSelectableConfigs(BluetoothDevice device) {
         final BluetoothA2dp bluetoothA2dp = mBluetoothA2dp;
         if (bluetoothA2dp == null) {
             return null;
         }
         BluetoothDevice bluetoothDevice =
-                (device != null) ? device : bluetoothA2dp.getActiveDevice();
+                (device != null) ? device : getA2dpActiveDevice();
         if (bluetoothDevice == null) {
             return null;
         }
@@ -193,16 +195,12 @@
      * @return {@link BluetoothCodecConfig}.
      */
     protected BluetoothCodecConfig getSelectableByCodecType(int codecTypeValue) {
-        BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get selectable config. No active device.");
             return null;
         }
-        final BluetoothCodecConfig[] configs = getSelectableConfigs(activeDevice);
-        if (configs == null) {
-            Log.d(TAG, "Unable to get selectable config. Selectable configs is empty.");
-            return null;
-        }
+        final List<BluetoothCodecConfig> configs = getSelectableConfigs(activeDevice);
         for (BluetoothCodecConfig config : configs) {
             if (config.getCodecType() == codecTypeValue) {
                 return config;
@@ -219,14 +217,20 @@
      */
     public void onHDAudioEnabled(boolean enabled) {}
 
-    static int getHighestCodec(BluetoothCodecConfig[] configs) {
+    static int getHighestCodec(BluetoothA2dp bluetoothA2dp, BluetoothDevice activeDevice,
+            List<BluetoothCodecConfig> configs) {
         if (configs == null) {
             Log.d(TAG, "Unable to get highest codec. Configs are empty");
             return BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
         }
+        // If HD audio is not enabled, SBC is the only one available codec.
+        if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice)
+                != BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
+            return BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
+        }
         for (int i = 0; i < CODEC_TYPES.length; i++) {
-            for (int j = 0; j < configs.length; j++) {
-                if ((configs[j].getCodecType() == CODEC_TYPES[i])) {
+            for (BluetoothCodecConfig config : configs) {
+                if (config.getCodecType() == CODEC_TYPES[i]) {
                     return CODEC_TYPES[i];
                 }
             }
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
index 6735115..d3fab67 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
@@ -17,8 +17,14 @@
 package com.android.settings.development.bluetooth;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settings.development.BluetoothServiceConnectionListener;
@@ -27,6 +33,8 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.List;
+
 /**
  * Abstract class for Bluetooth A2DP config controller in developer option.
  */
@@ -36,12 +44,16 @@
 
     protected volatile BluetoothA2dp mBluetoothA2dp;
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     public AbstractBluetoothPreferenceController(Context context, Lifecycle lifecycle,
                                                  BluetoothA2dpConfigStore store) {
         super(context);
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
+        mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
     }
 
     @Override
@@ -82,4 +94,13 @@
          */
         void onBluetoothHDAudioEnabled(boolean enabled);
     }
+
+    protected BluetoothDevice getA2dpActiveDevice() {
+        if (mBluetoothAdapter == null) {
+            return null;
+        }
+        List<BluetoothDevice> activeDevices =
+                mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP);
+        return (activeDevices.size() > 0) ? activeDevices.get(0) : null;
+    }
 }
diff --git a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
index 6b243c6..a65a1ba 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceController.java
@@ -69,7 +69,7 @@
         if (bluetoothA2dp == null) {
             return index;
         }
-        final BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        final BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.d(TAG, "Unable to get selectable index. No Active Bluetooth device");
             return index;
@@ -77,7 +77,7 @@
         // Check HD audio is enabled, display the available list.
         if (bluetoothA2dp.isOptionalCodecsEnabled(activeDevice)
                 == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
-            BluetoothCodecConfig[] configs = getSelectableConfigs(activeDevice);
+            List<BluetoothCodecConfig> configs = getSelectableConfigs(activeDevice);
             if (configs != null) {
                 return getIndexFromConfig(configs);
             }
@@ -93,8 +93,9 @@
         int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
         switch (index) {
             case 0:
-                codecTypeValue = getHighestCodec(getSelectableConfigs(
-                    mBluetoothA2dp.getActiveDevice()));
+                final BluetoothDevice activeDevice = getA2dpActiveDevice();
+                codecTypeValue = getHighestCodec(mBluetoothA2dp, activeDevice,
+                        getSelectableConfigs(activeDevice));
                 codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
                 break;
             case 1:
@@ -147,10 +148,15 @@
         mCallback.onBluetoothCodecChanged();
     }
 
-    private List<Integer> getIndexFromConfig(BluetoothCodecConfig[] configs) {
+    @Override
+    public void onHDAudioEnabled(boolean enabled) {
+        writeConfigurationValues(/* index= */ 0);
+    }
+
+    private List<Integer> getIndexFromConfig(List<BluetoothCodecConfig> configs) {
         List<Integer> indexArray = new ArrayList<>();
-        for (int i = 0; i < configs.length; i++) {
-            indexArray.add(convertCfgToBtnIndex(configs[i].getCodecType()));
+        for (BluetoothCodecConfig config : configs) {
+            indexArray.add(convertCfgToBtnIndex(config.getCodecType()));
         }
         return indexArray;
     }
diff --git a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
index d4ca4e5..8092194 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceController.java
@@ -52,7 +52,7 @@
             mPreference.setEnabled(false);
             return;
         }
-        final BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        final BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             Log.e(TAG, "Active device is null. To disable HD audio button");
             mPreference.setEnabled(false);
@@ -84,7 +84,7 @@
         final int prefValue = enabled
                 ? BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED
                 : BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED;
-        BluetoothDevice activeDevice = bluetoothA2dp.getActiveDevice();
+        BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
             mPreference.setEnabled(false);
             return true;
diff --git a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
index 03e2b04..4b22412 100644
--- a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
+++ b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.UserInfo;
-import android.net.TrafficStats;
 import android.os.AsyncTask;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -29,6 +28,7 @@
 import android.os.storage.VolumeInfo;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
+import android.util.DataUnit;
 import android.util.Log;
 
 import java.io.IOException;
@@ -42,7 +42,7 @@
     /**
      * Assume roughly a Class 10 card.
      */
-    private static final long SPEED_ESTIMATE_BPS = 10 * TrafficStats.MB_IN_BYTES;
+    private static final long SPEED_ESTIMATE_BPS = DataUnit.MEBIBYTES.toBytes(10);
 
     private final Context mContext;
 
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 95f74fa..f2bce78 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -631,7 +631,7 @@
                 final List<UiccCardInfo> infos = mTelephonyManager.getUiccCardsInfo();
 
                 for (UiccCardInfo info : infos) {
-                    if (info.getSlotIndex() == pSlotId) {
+                    if (info.getPhysicalSlotIndex() == pSlotId) {
                         if (info.isEuicc()) {
                             shouldHaveEid = true;
                             eid = info.getEid();
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index fd9ae8c..ee0c9e7 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -24,12 +24,12 @@
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.VolumeInfo;
+import android.util.DataUnit;
 import android.util.Log;
 import android.util.SparseArray;
 import android.widget.Toast;
@@ -389,7 +389,8 @@
                 attributedSize -= otherData.duplicateCodeSize;
             }
 
-            final long systemSize = Math.max(TrafficStats.GB_IN_BYTES, mUsedBytes - attributedSize);
+            final long systemSize = Math.max(DataUnit.GIBIBYTES.toBytes(1),
+                    mUsedBytes - attributedSize);
             mSystemPreference.setStorageSize(systemSize, mTotalSize);
         }
 
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
index 25d1cda..e5bd449 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -54,8 +54,8 @@
     private boolean mIsExpanded;
 
     public ConditionContextualCardController(Context context) {
-        mContext = context;
-        mConditionManager = new ConditionManager(context.getApplicationContext(), this);
+        mContext = context.getApplicationContext();
+        mConditionManager = new ConditionManager(mContext, this);
         mConditionManager.startMonitoringStateChange();
     }
 
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
index 4a32433..aefd55f 100644
--- a/src/com/android/settings/network/EnableMultiSimSidecar.java
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -24,6 +24,7 @@
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 import android.util.ArraySet;
 import android.util.Log;
@@ -62,23 +63,23 @@
                 @Override
                 public void onReceive(Context context, Intent intent) {
                     int readySimsCount = getReadySimsCount();
-                    int activeSlotsCount = getActiveSlotsCount();
-                    // If the number of ready SIM count and active slots equal to the number of SIMs
+                    int activePortsCount = getActivePortsCount();
+                    // If the number of ready SIM count and active ports equal to the number of SIMs
                     // need to be activated, the device is successfully switched to multiple active
                     // SIM mode.
-                    if (readySimsCount == mNumOfActiveSim && activeSlotsCount == mNumOfActiveSim) {
+                    if (readySimsCount == mNumOfActiveSim && activePortsCount == mNumOfActiveSim) {
                         Log.i(
                                 TAG,
-                                String.format("%d slots are active and ready.", mNumOfActiveSim));
+                                String.format("%d ports are active and ready.", mNumOfActiveSim));
                         mSimCardStateChangedLatch.countDown();
                         return;
                     }
                     Log.i(
                             TAG,
                             String.format(
-                                    "%d slots are active and %d SIMs are ready. Keep waiting until"
+                                    "%d ports are active and %d SIMs are ready. Keep waiting until"
                                             + " timeout.",
-                                    activeSlotsCount, readySimsCount));
+                                    activePortsCount, readySimsCount));
                 }
             };
 
@@ -162,19 +163,22 @@
         return readyCardsCount;
     }
 
-    // Get active slots count from {@code TelephonyManager#getUiccSlotsInfo}.
-    private int getActiveSlotsCount() {
+    // Get active port count from {@code TelephonyManager#getUiccSlotsInfo}.
+    private int getActivePortsCount() {
         UiccSlotInfo[] slotsInfo = mTelephonyManager.getUiccSlotsInfo();
         if (slotsInfo == null) {
             return 0;
         }
-        int activeSlots = 0;
+        int activePorts = 0;
         for (UiccSlotInfo slotInfo : slotsInfo) {
-            if (slotInfo != null && slotInfo.getIsActive()) {
-                activeSlots++;
+            for (UiccPortInfo portInfo : slotInfo.getPorts()) {
+                if (slotInfo != null && portInfo.isActive()) {
+                    activePorts++;
+                }
             }
+
         }
-        return activeSlots;
+        return activePorts;
     }
 
     /** Returns a list of active removable logical slot ids. */
@@ -185,8 +189,10 @@
         }
         Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
         for (UiccSlotInfo info : infos) {
-            if (info != null && info.getIsActive() && info.isRemovable()) {
-                activeRemovableLogicalSlotIds.add(info.getLogicalSlotIdx());
+            for (UiccPortInfo portInfo :info.getPorts()) {
+                if (info != null && portInfo.isActive() && info.isRemovable()) {
+                    activeRemovableLogicalSlotIds.add(portInfo.getLogicalSlotIndex());
+                }
             }
         }
         return activeRemovableLogicalSlotIds;
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 7d71096..b1f964b 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -17,6 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.text.TextUtils;
 
 import androidx.preference.Preference;
@@ -50,6 +51,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE_UNSEARCHABLE;
+        return mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
+                : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java
index 06cd6a7..5b2cab7 100644
--- a/src/com/android/settings/network/EthernetTetherPreferenceController.java
+++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java
@@ -48,13 +48,12 @@
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     public void onStart() {
-        mEthernetListener = new EthernetManager.Listener() {
-            @Override
-            public void onAvailabilityChanged(String iface, boolean isAvailable) {
-                new Handler(Looper.getMainLooper()).post(() -> updateState(mPreference));
-            }
-        };
-        mEthernetManager.addListener(mEthernetListener);
+        mEthernetListener = (iface, isAvailable) -> updateState(mPreference);
+        final Handler handler = new Handler(Looper.getMainLooper());
+        // Executor will execute to post the updateState event to a new handler which is created
+        // from the main looper when the {@link EthernetManager.Listener.onAvailabilityChanged}
+        // is triggerd.
+        mEthernetManager.addListener(mEthernetListener, r -> handler.post(r));
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index fccd874..1e660b0 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -302,9 +302,8 @@
         mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0 /*subId*/, null /*service*/);
+        mDataUsagePreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI)
+                        .build(), 0 /*subId*/, null /*service*/);
         mResetInternetPreference = findPreference(PREF_KEY_RESET_INTERNET);
         if (mResetInternetPreference != null) {
             mResetInternetPreference.setVisible(false);
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 1c3fc76..442af38 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -189,6 +189,8 @@
         if (linkInfo.isActionable()) {
             helpTextView.setText(AnnotationSpan.linkify(
                     context.getText(R.string.private_dns_help_message), linkInfo));
+        } else {
+            helpTextView.setText("");
         }
     }
 
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 2d60778..c77a294 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -87,8 +87,8 @@
         if (slotInfo == null)  {
             return false;
         }
-        return !slotInfo.getIsEuicc() && !slotInfo.getIsActive() &&
-                slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
+        return !slotInfo.getIsEuicc() && !slotInfo.getPorts().stream().findFirst().get()
+                .isActive() && slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT;
     }
 
     /**
@@ -179,7 +179,8 @@
             // verify if subscription is inserted within slot
             for (UiccSlotInfo slotInfo : slotsInfo) {
                 if ((slotInfo != null) && (!slotInfo.getIsEuicc())
-                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())) {
+                        && (slotInfo.getPorts().stream().findFirst().get().getLogicalSlotIndex()
+                        == subInfo.getSimSlotIndex())) {
                     return true;
                 }
             }
@@ -576,7 +577,7 @@
             if (!cardInfo.isRemovable()
                     || cardInfo.getCardId() == TelephonyManager.UNSUPPORTED_CARD_ID) {
                 Log.i(TAG, "Skip embedded card or invalid cardId on slot: "
-                        + cardInfo.getSlotIndex());
+                        + cardInfo.getPhysicalSlotIndex());
                 continue;
             }
             Log.i(TAG, "Target removable cardId :" + cardInfo.getCardId());
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index 6113f5a..ccf3f91 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -96,7 +96,7 @@
         if (slotId == INVALID_PHYSICAL_SLOT_ID) {
             for (int i = 0; i < slots.length; i++) {
                 if (slots[i].isRemovable()
-                        && !slots[i].getIsActive()
+                        && !slots[i].getPorts().stream().findFirst().get().isActive()
                         && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
                         && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
                     performSwitchToRemovableSlot(i, context);
@@ -107,7 +107,7 @@
             if (slotId >= slots.length || !slots[slotId].isRemovable()) {
                 throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
             }
-            if (!slots[slotId].getIsActive()) {
+            if (!slots[slotId].getPorts().stream().findFirst().get().isActive()) {
                 performSwitchToRemovableSlot(slotId, context);
             }
         }
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index 4df2e5e..dbd4ae0 100755
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -322,6 +322,8 @@
         final StringBuilder where =
                 new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
                 + "user_visible!=0");
+        // Remove Emergency type, users should not mess with that
+        where.append(" AND NOT (type='emergency')");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");
diff --git a/src/com/android/settings/network/helper/QuerySimSlotIndex.java b/src/com/android/settings/network/helper/QuerySimSlotIndex.java
index b70a148..ee53f94 100644
--- a/src/com/android/settings/network/helper/QuerySimSlotIndex.java
+++ b/src/com/android/settings/network/helper/QuerySimSlotIndex.java
@@ -17,14 +17,16 @@
 
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicIntegerArray;
+import java.util.stream.IntStream;
 
 /**
- * This is a Callable class which query slot index within device
+ * This is a Callable class which query logical slot index within device
  */
 public class QuerySimSlotIndex implements Callable<AtomicIntegerArray> {
     private static final String TAG = "QuerySimSlotIndex";
@@ -58,30 +60,32 @@
             return new AtomicIntegerArray(0);
         }
         int slotIndexFilter = mOnlySlotWithSim ? 0 : SubscriptionManager.INVALID_SIM_SLOT_INDEX;
+
         return new AtomicIntegerArray(Arrays.stream(slotInfo)
-                .filter(slot -> filterSlot(slot))
-                .mapToInt(slot -> mapToSlotIndex(slot))
+                .flatMapToInt(slot -> mapToLogicalSlotIndex(slot))
                 .filter(slotIndex -> (slotIndex >= slotIndexFilter))
                 .toArray());
     }
 
-    protected boolean filterSlot(UiccSlotInfo slotInfo) {
+    protected IntStream mapToLogicalSlotIndex(UiccSlotInfo slotInfo) {
+        if (slotInfo == null) {
+            return IntStream.of(SubscriptionManager.INVALID_SIM_SLOT_INDEX);
+        }
+        if (slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_ABSENT) {
+            return IntStream.of(SubscriptionManager.INVALID_SIM_SLOT_INDEX);
+        }
+        return slotInfo.getPorts().stream()
+                .filter(port -> filterPort(port))
+                .mapToInt(port -> port.getLogicalSlotIndex());
+    }
+
+    protected boolean filterPort(UiccPortInfo uiccPortInfo) {
         if (mDisabledSlotsIncluded) {
             return true;
         }
-        if (slotInfo == null) {
+        if (uiccPortInfo == null) {
             return false;
         }
-        return slotInfo.getIsActive();
-    }
-
-    protected int mapToSlotIndex(UiccSlotInfo slotInfo) {
-        if (slotInfo == null) {
-            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
-        }
-        if (slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_ABSENT) {
-            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
-        }
-        return slotInfo.getLogicalSlotIdx();
+        return uiccPortInfo.isActive();
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 25e0ae0..aa58663 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -23,9 +23,11 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
@@ -59,16 +61,25 @@
     private CarrierConfigManager mCarrierConfigManager;
     private PreferenceEntriesBuilder mBuilder;
     private SubscriptionsChangeListener mSubscriptionsListener;
+    private int mCallState = TelephonyManager.CALL_STATE_IDLE;
+    private PhoneCallStateTelephonyCallback mTelephonyCallback;
 
     public EnabledNetworkModePreferenceController(Context context, String key) {
         super(context, key);
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
+        if (mTelephonyCallback == null) {
+            mTelephonyCallback = new PhoneCallStateTelephonyCallback();
+        }
     }
 
     @Override
     public int getAvailabilityStatus(int subId) {
         boolean visible;
+        if (!isCallStateIdle()) {
+            return AVAILABLE_UNSEARCHABLE;
+        }
+
         final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
         if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             visible = false;
@@ -87,23 +98,28 @@
 
         return visible ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
+    protected boolean isCallStateIdle() {
+        return mCallState == TelephonyManager.CALL_STATE_IDLE;
+    }
 
     @OnLifecycleEvent(ON_START)
     public void onStart() {
         mSubscriptionsListener.start();
-        if (mAllowedNetworkTypesListener == null) {
+        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
         }
         mAllowedNetworkTypesListener.register(mContext, mSubId);
+        mTelephonyCallback.register(mTelephonyManager, mSubId);
     }
 
     @OnLifecycleEvent(ON_STOP)
     public void onStop() {
         mSubscriptionsListener.stop();
-        if (mAllowedNetworkTypesListener == null) {
+        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
             return;
         }
         mAllowedNetworkTypesListener.unregister(mContext, mSubId);
+        mTelephonyCallback.unregister();
     }
 
     @Override
@@ -125,6 +141,7 @@
         listPreference.setEntryValues(mBuilder.getEntryValues());
         listPreference.setValue(Integer.toString(mBuilder.getSelectedEntryValue()));
         listPreference.setSummary(mBuilder.getSummary());
+        listPreference.setEnabled(isCallStateIdle());
     }
 
     @Override
@@ -157,7 +174,6 @@
                         updatePreference();
                     });
         }
-
         lifecycle.addObserver(this);
     }
 
@@ -828,6 +844,43 @@
 
     }
 
+    @VisibleForTesting
+    class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
+
+        private TelephonyManager mTelephonyManager;
+
+        @Override
+        public void onCallStateChanged(int state) {
+            Log.d(LOG_TAG, "onCallStateChanged:" + state);
+            mCallState = state;
+            mBuilder.updateConfig();
+            updatePreference();
+        }
+
+        public void register(TelephonyManager telephonyManager, int subId) {
+            mTelephonyManager = telephonyManager;
+
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
+            mTelephonyManager.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
+        }
+
+        public void unregister() {
+            mCallState = TelephonyManager.CALL_STATE_IDLE;
+            if (mTelephonyManager != null) {
+                mTelephonyManager.unregisterTelephonyCallback(this);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    PhoneCallStateTelephonyCallback getTelephonyCallback() {
+        return mTelephonyCallback;
+    }
+
     @Override
     public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
     }
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index 5ea7c20..12612d6 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -77,9 +77,6 @@
             mTelephonyCallback = new PhoneCallStateTelephonyCallback();
         }
 
-        if (mSubId == subId) {
-            return this;
-        }
         mSubId = subId;
         final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
         if (carrierConfig == null) {
@@ -136,7 +133,7 @@
 
     @Override
     public void onStart() {
-        if (!isModeMatched() || (mTelephonyCallback == null)) {
+        if (mTelephonyCallback == null) {
             return;
         }
         mTelephonyCallback.register(mContext, mSubId);
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 0064e6c..65d8cd7 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -462,7 +462,8 @@
                                 slot ->
                                         slot != null
                                                 && slot.isRemovable()
-                                                && slot.getIsActive()
+                                                && slot.getPorts().stream().anyMatch(
+                                                        port -> port.isActive())
                                                 && slot.getCardStateInfo()
                                                         == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
         if (mIsEsimOperation && isRemovableSimEnabled) {
@@ -476,7 +477,7 @@
             Log.i(
                     TAG,
                     "Removable SIM operation and eSIM profile is enabled. DSDS condition"
-                        + " satisfied.");
+                            + " satisfied.");
             return true;
         }
         Log.i(TAG, "DSDS condition not satisfied.");
diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
index 9d3673d..edb12dd 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
+import android.os.UserManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -127,7 +128,10 @@
     public CharSequence getSummary() {
         final PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
         if (defaultApp != null) {
-            return defaultApp.label;
+            UserManager um = mContext.createContextAsUser(
+                    defaultApp.userHandle, /*flags=*/0).getSystemService(UserManager.class);
+
+            return defaultApp.label + " (" + um.getUserName() + ")";
         } else {
             return mContext.getText(R.string.nfc_payment_default_not_set);
         }
@@ -218,12 +222,15 @@
             }
 
             // Prevent checked callback getting called on recycled views
+            UserManager um = mContext.createContextAsUser(
+                    appInfo.userHandle, /*flags=*/0).getSystemService(UserManager.class);
+
             holder.radioButton.setOnCheckedChangeListener(null);
             holder.radioButton.setChecked(appInfo.isDefault);
-            holder.radioButton.setContentDescription(appInfo.label);
+            holder.radioButton.setContentDescription(appInfo.label + " (" + um.getUserName() + ")");
             holder.radioButton.setOnCheckedChangeListener(this);
             holder.radioButton.setTag(appInfo);
-            holder.radioButton.setText(appInfo.label);
+            holder.radioButton.setText(appInfo.label + " (" + um.getUserName() + ")");
             return convertView;
         }
 
@@ -245,7 +252,8 @@
 
         private void makeDefault(PaymentAppInfo appInfo) {
             if (!appInfo.isDefault) {
-                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
+                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName,
+                        appInfo.userHandle.getIdentifier());
             }
             final Dialog dialog = mPreference.getDialog();
             if (dialog != null) {
diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java
index a87855e..542c95b 100644
--- a/src/com/android/settings/nfc/PaymentBackend.java
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -16,11 +16,10 @@
 
 package com.android.settings.nfc;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.nfc.NfcAdapter;
 import android.nfc.cardemulation.ApduServiceInfo;
 import android.nfc.cardemulation.CardEmulation;
@@ -28,6 +27,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 
@@ -49,6 +49,15 @@
         boolean isDefault;
         public ComponentName componentName;
         public ComponentName settingsComponent;
+        public UserHandle userHandle;
+    }
+
+    /**
+     * ComponentName of the payment application and the userId that it belongs to.
+     */
+    public static class PaymentInfo {
+        public ComponentName componentName;
+        public int userId;
     }
 
     private final Context mContext;
@@ -79,40 +88,55 @@
 
     public void refresh() {
         PackageManager pm = mContext.getPackageManager();
-        List<ApduServiceInfo> serviceInfos =
-                mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT);
-        ArrayList<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+        ArrayList<PaymentAppInfo> appInfosAllProfiles = new ArrayList<PaymentAppInfo>();
 
-        if (serviceInfos == null) {
-            makeCallbacks();
-            return;
-        }
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
 
-        ComponentName defaultAppName = getDefaultPaymentApp();
+        PaymentInfo defaultAppName = getDefaultPaymentApp();
         PaymentAppInfo foundDefaultApp = null;
-        for (ApduServiceInfo service : serviceInfos) {
-            PaymentAppInfo appInfo = new PaymentAppInfo();
-            appInfo.label = service.loadLabel(pm);
-            if (appInfo.label == null) {
-                appInfo.label = service.loadAppLabel(pm);
+        for (UserHandle uh : userHandles) {
+            List<ApduServiceInfo> serviceInfosByProfile =
+                    mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT, uh.getIdentifier());
+            if (serviceInfosByProfile == null) continue;
+
+            ArrayList<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+
+            for (ApduServiceInfo service : serviceInfosByProfile) {
+                PaymentAppInfo appInfo = new PaymentAppInfo();
+                appInfo.userHandle = uh;
+                appInfo.label = service.loadLabel(pm);
+                if (appInfo.label == null) {
+                    appInfo.label = service.loadAppLabel(pm);
+                }
+                if (defaultAppName == null) {
+                    appInfo.isDefault = false;
+                } else {
+                    appInfo.isDefault =
+                            service.getComponent().equals(defaultAppName.componentName)
+                            && defaultAppName.userId == uh.getIdentifier();
+                }
+                if (appInfo.isDefault) {
+                    foundDefaultApp = appInfo;
+                }
+                appInfo.componentName = service.getComponent();
+                String settingsActivity = service.getSettingsActivityName();
+                if (settingsActivity != null) {
+                    appInfo.settingsComponent = new ComponentName(
+                            appInfo.componentName.getPackageName(),
+                            settingsActivity);
+                } else {
+                    appInfo.settingsComponent = null;
+                }
+                appInfo.description = service.getDescription();
+
+                appInfos.add(appInfo);
             }
-            appInfo.isDefault = service.getComponent().equals(defaultAppName);
-            if (appInfo.isDefault) {
-                foundDefaultApp = appInfo;
-            }
-            appInfo.componentName = service.getComponent();
-            String settingsActivity = service.getSettingsActivityName();
-            if (settingsActivity != null) {
-                appInfo.settingsComponent = new ComponentName(
-                        appInfo.componentName.getPackageName(),
-                        settingsActivity);
-            } else {
-                appInfo.settingsComponent = null;
-            }
-            appInfo.description = service.getDescription();
-            appInfos.add(appInfo);
+            appInfosAllProfiles.addAll(appInfos);
         }
-        mAppInfos = appInfos;
+        mAppInfos = appInfosAllProfiles;
         mDefaultAppInfo = foundDefaultApp;
         makeCallbacks();
     }
@@ -141,21 +165,44 @@
 
     boolean isForegroundMode() {
         try {
-            return Settings.Secure.getInt(mContext.getContentResolver(),
-                    Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0;
+            return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0;
         } catch (SettingNotFoundException e) {
             return false;
         }
     }
 
     void setForegroundMode(boolean foreground) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0);
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(UserHandle.myUserId()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+        for (UserHandle uh : userHandles) {
+            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                    Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0, uh.getIdentifier());
+        }
     }
 
-    ComponentName getDefaultPaymentApp() {
-        String componentString = Settings.Secure.getString(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
+    PaymentInfo getDefaultPaymentApp() {
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+        for (UserHandle uh : userHandles) {
+            ComponentName defaultApp = getDefaultPaymentApp(uh.getIdentifier());
+            if (defaultApp != null) {
+                PaymentInfo appInfo = new PaymentInfo();
+                appInfo.userId = uh.getIdentifier();
+                appInfo.componentName = defaultApp;
+                return appInfo;
+            }
+        }
+        return null;
+    }
+
+    ComponentName getDefaultPaymentApp(int userId) {
+        String componentString = Settings.Secure.getStringForUser(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, userId);
         if (componentString != null) {
             return ComponentName.unflattenFromString(componentString);
         } else {
@@ -164,9 +211,29 @@
     }
 
     public void setDefaultPaymentApp(ComponentName app) {
-        Settings.Secure.putString(mContext.getContentResolver(),
-                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
-                app != null ? app.flattenToString() : null);
+        setDefaultPaymentApp(app, UserHandle.myUserId());
+    }
+
+    /**
+     *  Set Nfc default payment application
+     */
+    public void setDefaultPaymentApp(ComponentName app, int userId) {
+        UserManager um = mContext.createContextAsUser(
+                UserHandle.of(ActivityManager.getCurrentUser()), /*flags=*/0)
+                .getSystemService(UserManager.class);
+        List<UserHandle> userHandles = um.getEnabledProfiles();
+
+        for (UserHandle uh : userHandles) {
+            if (uh.getIdentifier() == userId) {
+                Settings.Secure.putStringForUser(mContext.getContentResolver(),
+                        Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                        app != null ? app.flattenToString() : null, uh.getIdentifier());
+            } else {
+                Settings.Secure.putStringForUser(mContext.getContentResolver(),
+                        Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                        null, uh.getIdentifier());
+            }
+        }
         refresh();
     }
 
diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
index d5a86a8..a888167 100644
--- a/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -21,12 +21,14 @@
 import android.content.Intent;
 import android.nfc.cardemulation.CardEmulation;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settings.nfc.PaymentBackend.PaymentInfo;
 
 import java.util.List;
 
@@ -39,7 +41,7 @@
     private static final int PAYMENT_APP_MAX_CAPTION_LENGTH = 40;
 
     private PaymentBackend mBackend;
-    private ComponentName mNewDefault;
+    private PaymentInfo mNewDefault;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,9 +58,10 @@
         ComponentName component = intent.getParcelableExtra(
                 CardEmulation.EXTRA_SERVICE_COMPONENT);
         String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
+        int userId = intent.getIntExtra(CardEmulation.EXTRA_USERID, UserHandle.myUserId());
 
         setResult(RESULT_CANCELED);
-        if (!buildDialog(component, category)) {
+        if (!buildDialog(component, category, userId)) {
             finish();
         }
 
@@ -68,7 +71,7 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                mBackend.setDefaultPaymentApp(mNewDefault);
+                mBackend.setDefaultPaymentApp(mNewDefault.componentName, mNewDefault.userId);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
@@ -76,7 +79,7 @@
         }
     }
 
-    private boolean buildDialog(ComponentName component, String category) {
+    private boolean buildDialog(ComponentName component, String category, int userId) {
         if (component == null || category == null) {
             Log.e(TAG, "Component or category are null");
             return false;
@@ -93,10 +96,12 @@
 
         List<PaymentAppInfo> services = mBackend.getPaymentAppInfos();
         for (PaymentAppInfo service : services) {
-            if (component.equals(service.componentName)) {
+            // check if userId matches
+            if (component.equals(service.componentName)
+                    && service.userHandle.getIdentifier() == userId) {
                 requestedPaymentApp = service;
             }
-            if (service.isDefault) {
+            if (service.isDefault && service.userHandle.getIdentifier() == userId) {
                 defaultPaymentApp = service;
             }
         }
@@ -107,13 +112,17 @@
         }
 
         // Get current mode and default component
-        ComponentName defaultComponent = mBackend.getDefaultPaymentApp();
-        if (defaultComponent != null && defaultComponent.equals(component)) {
+        PaymentInfo defaultComponent = mBackend.getDefaultPaymentApp();
+        if (defaultComponent != null && defaultComponent.componentName.equals(component)
+                && defaultComponent.userId == userId) {
             Log.e(TAG, "Component " + component + " is already default.");
             return false;
         }
 
-        mNewDefault = component;
+        mNewDefault = new PaymentInfo();
+        mNewDefault.componentName = component;
+        mNewDefault.userId = userId;
+
         // Compose dialog; get
         final AlertController.AlertParams p = mAlertParams;
         if (defaultPaymentApp == null) {
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index fe8b168..bd5b83a 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -640,7 +640,7 @@
                     .append(' ')
                     .append(bold(getString(R.string.notification_log_details_ashmem)))
                     .append(delim)
-                    .append(String.valueOf(p.getBlobAshmemSize()))
+                    .append(String.valueOf(p.getOpenAshmemSize()))
                     .append("\n");
         }
         return sb;
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
index cac6e3f..3b2013b 100644
--- a/src/com/android/settings/password/OWNERS
+++ b/src/com/android/settings/password/OWNERS
@@ -1,7 +1,12 @@
 # Default reviewers for this and subdirectories.
+curtislb@google.com
+graciecheng@google.com
+ilyamaty@google.com
 jaggies@google.com
+jbolinger@google.com
+joshmccloskey@google.com
 kchyn@google.com
 paulcrowley@google.com
 rubinxu@google.com
 
-# Emergency approvers in case the above are not available
\ No newline at end of file
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index fe44389..e0bc9cd 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -164,14 +164,12 @@
 
     private void handleSimInsert(UiccSlotInfo removableSlotInfo) {
         Log.i(TAG, "Handle SIM inserted.");
-
         if (!isSuwFinished(mContext)) {
             Log.i(TAG, "Still in SUW. Handle SIM insertion after SUW is finished");
             setSuwRemovableSlotAction(mContext, LAST_USER_ACTION_IN_SUW_INSERT);
             return;
         }
-
-        if (removableSlotInfo.getIsActive()) {
+        if (removableSlotInfo.getPorts().stream().findFirst().get().isActive()) {
             Log.i(TAG, "The removable slot is already active. Do nothing.");
             return;
         }
@@ -213,7 +211,8 @@
 
         List<SubscriptionInfo> groupedEmbeddedSubscriptions = getGroupedEmbeddedSubscriptions();
 
-        if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getIsActive()) {
+        if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getPorts().stream()
+                .findFirst().get().isActive()) {
             Log.i(TAG, "eSIM slot is active or no subscriptions exist. Do nothing.");
             return;
         }
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
index f2c7c65..f144c6b 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
@@ -116,9 +117,11 @@
             if (cardInfo == null) {
                 continue;
             }
-            if (!TextUtils.isEmpty(slotInfo.getCardId())
-                    || !TextUtils.isEmpty(cardInfo.getIccId())) {
-                isAllCardStringsEmpty = false;
+            for (UiccPortInfo portInfo : cardInfo.getPorts()) {
+                if (!TextUtils.isEmpty(slotInfo.getCardId())
+                        || !TextUtils.isEmpty(portInfo.getIccId())) {
+                    isAllCardStringsEmpty = false;
+                }
             }
         }
 
@@ -139,7 +142,7 @@
             return null;
         }
         return cardInfos.stream()
-                .filter(info -> info.getSlotIndex() == physicalSlotIndex)
+                .filter(info -> info.getPhysicalSlotIndex() == physicalSlotIndex)
                 .findFirst()
                 .orElse(null);
     }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c4b4d59..0c3b1ae 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -265,9 +265,8 @@
         mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */), 0 /*subId*/, null /*service*/);
+        mDataUsagePreference.setTemplate(new NetworkTemplate.Builder(
+                NetworkTemplate.MATCH_WIFI).build(), 0 /*subId*/, null /*service*/);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java b/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java
new file mode 100644
index 0000000..60400b0
--- /dev/null
+++ b/src/com/android/settings/wifi/calling/LinkifyDescriptionPreference.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.calling;
+
+import android.content.Context;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.util.Linkify;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.core.text.util.LinkifyCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+/** A preference which supports linkify text as a description in the summary **/
+public class LinkifyDescriptionPreference extends Preference {
+
+    public LinkifyDescriptionPreference(Context context) {
+        this(context, null);
+    }
+
+    public LinkifyDescriptionPreference(Context context, AttributeSet attrs) {
+      super(context, attrs);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);
+        if (summaryView == null || summaryView.getVisibility() != View.VISIBLE) {
+            return;
+        }
+
+        final CharSequence summary = getSummary();
+        if (TextUtils.isEmpty(summary)) {
+            return;
+        }
+
+        summaryView.setMaxLines(Integer.MAX_VALUE);
+
+        final SpannableString spannableSummary = new SpannableString(summary);
+        if (spannableSummary.getSpans(0, spannableSummary.length(), ClickableSpan.class)
+                .length > 0) {
+            summaryView.setMovementMethod(LinkMovementMethod.getInstance());
+        }
+        LinkifyCompat.addLinks(summaryView,
+                Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS);
+    }
+}
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index de64b91..19664be 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -57,8 +57,11 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settings.wifi.calling.LinkifyDescriptionPreference;
 import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
+import java.util.List;
+
 /**
  * This is the inner class of {@link WifiCallingSettings} fragment.
  * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
@@ -72,6 +75,7 @@
     private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
     private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
     private static final String PREFERENCE_EMERGENCY_ADDRESS = "emergency_address_key";
+    private static final String PREFERENCE_NO_OPTIONS_DESC = "no_options_description";
 
     @VisibleForTesting
     static final int REQUEST_CHECK_WFC_EMERGENCY_ADDRESS = 1;
@@ -91,7 +95,6 @@
     private ListWithEntrySummaryPreference mButtonWfcMode;
     private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
     private Preference mUpdateAddress;
-    private TextView mEmptyView;
 
     private boolean mValidListener = false;
     private boolean mEditableWfcMode = true;
@@ -156,7 +159,7 @@
     }
 
     /*
-     * Launch carrier emergency address managemnent activity
+     * Launch carrier emergency address management activity
      */
     private final OnPreferenceClickListener mUpdateAddressListener =
             preference -> {
@@ -185,13 +188,6 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mEmptyView = getView().findViewById(android.R.id.empty);
-        setEmptyView(mEmptyView);
-        final Resources res = getResourcesForSubId();
-        final String emptyViewText = res.getString(R.string.wifi_calling_off_explanation,
-                res.getString(R.string.wifi_calling_off_explanation_2));
-        mEmptyView.setText(emptyViewText);
-
         mSwitchBar = getView().findViewById(R.id.switch_bar);
         mSwitchBar.show();
     }
@@ -307,6 +303,9 @@
 
         mIntentFilter = new IntentFilter();
         mIntentFilter.addAction(ImsManager.ACTION_WFC_IMS_REGISTRATION_ERROR);
+
+        updateDescriptionForOptions(
+                List.of(mButtonWfcMode, mButtonWfcRoamingMode, mUpdateAddress));
     }
 
     @Override
@@ -322,7 +321,7 @@
         final View view = inflater.inflate(
                 R.layout.wifi_calling_settings_preferences, container, false);
 
-        final ViewGroup prefs_container = view.findViewById(R.id.prefs_container);
+        final ViewGroup prefs_container = view.findViewById(android.R.id.tabcontent);
         Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
         final View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
         prefs_container.addView(prefs);
@@ -571,28 +570,35 @@
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         final boolean updateAddressEnabled = (getCarrierActivityIntent() != null);
         if (wfcEnabled) {
-            if (mEditableWfcMode) {
-                preferenceScreen.addPreference(mButtonWfcMode);
-            } else {
-                // Don't show WFC (home) preference if it's not editable.
-                preferenceScreen.removePreference(mButtonWfcMode);
-            }
-            if (mEditableWfcRoamingMode && !mUseWfcHomeModeForRoaming) {
-                preferenceScreen.addPreference(mButtonWfcRoamingMode);
-            } else {
-                // Don't show WFC roaming preference if it's not editable.
-                preferenceScreen.removePreference(mButtonWfcRoamingMode);
-            }
-            if (updateAddressEnabled) {
-                preferenceScreen.addPreference(mUpdateAddress);
-            } else {
-                preferenceScreen.removePreference(mUpdateAddress);
-            }
+            // Don't show WFC (home) preference if it's not editable.
+            mButtonWfcMode.setVisible(mEditableWfcMode);
+            // Don't show WFC roaming preference if it's not editable.
+            mButtonWfcRoamingMode.setVisible(
+                    mEditableWfcRoamingMode && !mUseWfcHomeModeForRoaming);
+            mUpdateAddress.setVisible(updateAddressEnabled);
         } else {
-            preferenceScreen.removePreference(mButtonWfcMode);
-            preferenceScreen.removePreference(mButtonWfcRoamingMode);
-            preferenceScreen.removePreference(mUpdateAddress);
+            mButtonWfcMode.setVisible(false);
+            mButtonWfcRoamingMode.setVisible(false);
+            mUpdateAddress.setVisible(false);
         }
+        updateDescriptionForOptions(
+                List.of(mButtonWfcMode, mButtonWfcRoamingMode, mUpdateAddress));
+    }
+
+    private void updateDescriptionForOptions(List<Preference> visibleOptions) {
+        LinkifyDescriptionPreference pref = findPreference(PREFERENCE_NO_OPTIONS_DESC);
+        if (pref == null) {
+            return;
+        }
+
+        boolean optionsAvailable = visibleOptions.stream().anyMatch(Preference::isVisible);
+        if (!optionsAvailable) {
+            final Resources res = getResourcesForSubId();
+            String emptyViewText = res.getString(R.string.wifi_calling_off_explanation,
+                    res.getString(R.string.wifi_calling_off_explanation_2));
+            pref.setSummary(emptyViewText);
+        }
+        pref.setVisible(!optionsAvailable);
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index 924e246..3cdff6e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -235,6 +235,32 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addsPreference() {
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addsPreference() {
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index be733ec..a53e693 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -427,6 +427,34 @@
         userEntryDialogExistingTextTest("test");
     }
 
+    @Test
+    public void groupPairing_setMemberDevice_showsMessageHint() {
+        // set the correct dialog type
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+        when(controller.isCoordinatedSetMemberDevice()).thenReturn(true);
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // verify message is what we expect it to be and is visible
+        TextView message = frag.getmDialog().findViewById(R.id.pairing_group_message);
+        assertThat(message.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void groupPairing_nonSetMemberDevice_hidesMessageHint() {
+        // set the correct dialog type
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+        when(controller.isCoordinatedSetMemberDevice()).thenReturn(false);
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // verify message is what we expect it to be and is visible
+        TextView message = frag.getmDialog().findViewById(R.id.pairing_group_message);
+        assertThat(message.getVisibility()).isEqualTo(View.GONE);
+    }
+
     // Runs a test simulating the user entry dialog type in a situation like device rotation, where
     // the dialog fragment gets created and we already have some existing text entered into the
     // pin field.
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index ea91fed..98f1fe3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -235,6 +235,33 @@
     }
 
     @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removesPreference() {
+        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
+    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removesPreference()
+    {
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        when(mBluetoothDeviceUpdater
+                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
+        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
+                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);
+
+        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
+    }
+
+    @Test
     public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {
         mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
                 BluetoothProfile.STATE_DISCONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index 78a7a69..da7516b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -250,4 +250,22 @@
         verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice,
                 BluetoothDevicePreference.SortType.TYPE_NO_SORT);
     }
+
+    @Test
+    public void forceUpdate_deviceIsSubDevice_doesNothing() {
+        final List<BluetoothDevice> bluetoothDevices = new ArrayList<>();
+        bluetoothDevices.add(mBluetoothDevice);
+
+        when(mBluetoothAdapter.isEnabled()).thenReturn(true);
+        when(mBluetoothAdapter.getMostRecentlyConnectedDevices()).thenReturn(bluetoothDevices);
+        when(mBluetoothManager.getCachedDeviceManager()).thenReturn(mDeviceManager);
+        when(mDeviceManager.findDevice(mBluetoothDevice)).thenReturn(mCachedBluetoothDevice);
+        when(mDeviceManager.isSubDevice(mBluetoothDevice)).thenReturn(true);
+
+        mBluetoothDeviceUpdater.forceUpdate();
+
+        verify(mBluetoothDeviceUpdater, never()).removePreference(mCachedBluetoothDevice);
+        verify(mBluetoothDeviceUpdater, never()).addPreference(mCachedBluetoothDevice,
+                BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index f75b7f0..68a8a86 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -310,8 +310,7 @@
         ReflectionHelpers.setField(mFragment, "mContext", context);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final long end = System.currentTimeMillis();
         final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
 
@@ -336,8 +335,7 @@
         ReflectionHelpers.setField(mFragment, "mContext", context);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final long end = System.currentTimeMillis();
         final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
 
@@ -368,8 +366,7 @@
         ReflectionHelpers.setField(mFragment, "mCycles", testCycles);
         ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
         ReflectionHelpers.setField(mFragment, "mTemplate",
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
 
         final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
                 mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */);
@@ -441,7 +438,7 @@
 
         assertThat(mFragment.mTemplate.getMatchRule())
                 .isEqualTo(NetworkTemplate.MATCH_WIFI);
-        assertNull(mFragment.mTemplate.getSubscriberId());
+        assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());
         assertThat(mFragment.mTemplate.getNetworkId())
                 .isEqualTo(NetworkTemplate.WIFI_NETWORKID_ALL);
     }
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
index ff8ef93..02f683a 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
@@ -24,6 +24,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.NetworkStats;
 import android.net.NetworkTemplate;
 
 import com.android.settingslib.net.DataUsageController;
@@ -58,8 +59,9 @@
     public void setTemplate_noDataUsage_shouldDisablePreference() {
         doReturn(0L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
 
-        mPreference.setTemplate(
-                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
+        mPreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                .setMeteredness(NetworkStats.METERED_YES).build(),
+                5 /* subId */, null /* services */);
 
         verify(mPreference).setEnabled(false);
         verify(mPreference).setIntent(null);
@@ -69,8 +71,9 @@
     public void setTemplate_hasDataUsage_shouldNotDisablePreference() {
         doReturn(200L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
 
-        mPreference.setTemplate(
-                NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
+        mPreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
+                .setMeteredness(NetworkStats.METERED_YES).build(),
+                5 /* subId */, null /* services */);
 
         verify(mPreference, never()).setEnabled(false);
         verify(mPreference).setIntent(any(Intent.class));
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index 4276407..783c2ed 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -73,6 +73,7 @@
         mLifecycle = new Lifecycle(mLifecycleOwner);
         mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = null;
         doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig(null);
         doNothing().when(mController).setCodecConfigPreference(any(), any());
         when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mBluetoothCodecConfig);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
index 98dc656..72477b9 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
@@ -25,7 +25,9 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
+
 import android.os.SystemProperties;
 
 import androidx.preference.ListPreference;
@@ -45,14 +47,12 @@
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
 
-  private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3;
+  private static int TEST_MAX_CONNECTED_AUDIO_DEVICES = 5;
 
   @Mock
   private PreferenceScreen mPreferenceScreen;
   @Spy
   private Context mSpyContext = RuntimeEnvironment.application;
-  @Spy
-  private Resources mSpyResources = RuntimeEnvironment.application.getResources();
 
   private ListPreference mPreference;
   private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
@@ -63,15 +63,19 @@
   @Before
   public void setup() {
     MockitoAnnotations.initMocks(this);
-    doReturn(mSpyResources).when(mSpyContext).getResources();
     // Get XML values without mock
     // Setup test list preference using XML values
     mPreference = new ListPreference(mSpyContext);
     mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
     mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
-    // Stub default max connected audio devices to a test controlled value
-    doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger(
-        com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
+    // Retrieve default max connected audio devices to a test controlled value
+    try {
+      Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth");
+      TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth"));
+    } catch (PackageManager.NameNotFoundException e) {
+      e.printStackTrace();
+    }
+
     // Init the actual controller
     mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
     // Construct preference in the controller via a mocked preference screen object
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index a12131d..d16a507 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -20,6 +20,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -30,6 +31,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -47,6 +49,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -58,6 +61,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private AbstractBluetoothDialogPreferenceController mController;
@@ -83,10 +88,15 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = spy(new AbstractBluetoothDialogPreferenceControllerImpl(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = spy(new BaseBluetoothDialogPreferenceImpl(mContext));
 
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .build();
         mCodecConfigs[0] = mCodecConfigAAC;
         mCodecConfigs[1] = mCodecConfigSBC;
 
@@ -94,7 +104,8 @@
         mController.displayPreference(mScreen);
         mCurrentConfig = mController.getCurrentConfigIndex();
         when(mPreference.generateSummary(mCurrentConfig)).thenReturn(SUMMARY);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
@@ -160,17 +171,19 @@
 
     @Test
     public void getSelectableConfigs_verifyConfig() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
-        assertThat(mController.getSelectableConfigs(null)).isEqualTo(mCodecConfigs);
+        assertThat(mController.getSelectableConfigs(null)).isEqualTo(Arrays.asList(mCodecConfigs));
     }
 
     @Test
     public void getSelectableByCodecType_verifyConfig() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -181,7 +194,8 @@
 
     @Test
     public void getSelectableByCodecType_unavailable() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -192,7 +206,8 @@
 
     @Test
     public void onBluetoothServiceConnected_verifyBluetoothA2dpConfigStore() {
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
index 0996ae3..5a24c8e 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothBitPerSampleDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothBitPerSampleDialogPreferenceController mController;
@@ -80,25 +85,25 @@
         mPreference = new BluetoothBitPerSampleDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_16 | BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_16
+                                | BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -127,7 +132,8 @@
     @Test
     public void getSelectableIndex_verifyList() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         List<Integer> indexList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
index 81fb3fe..3d94e2a 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothChannelModeDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothChannelModeDialogPreferenceController mController;
@@ -77,28 +82,28 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothChannelModeDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothChannelModeDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_NONE,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_MONO | BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_MONO
+                            | BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -124,7 +129,8 @@
     @Test
     public void getSelectableIndex_verifyList() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         List<Integer> indexList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
index 7dd2906..21111cd 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothCodecDialogPreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothCodecDialogPreferenceControllerTest {
 
@@ -52,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private AbstractBluetoothPreferenceController.Callback mCallback;
@@ -81,33 +88,49 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothCodecDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore, mCallback);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothCodecDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
-                BluetoothCodecConfig.SAMPLE_RATE_96000 | BluetoothCodecConfig.SAMPLE_RATE_176400,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_32,
-                BluetoothCodecConfig.CHANNEL_MODE_MONO | BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_16 | BluetoothCodecConfig.BITS_PER_SAMPLE_24,
-                BluetoothCodecConfig.CHANNEL_MODE_STEREO,
-                0, 0, 0, 0);
-        mCodecConfigAPTX = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX);
-        mCodecConfigAPTXHD = new BluetoothCodecConfig(
-                BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD);
-        mCodecConfigLDAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setCodecPriority(BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000
+                        | BluetoothCodecConfig.SAMPLE_RATE_176400)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_32)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_MONO
+                        | BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setCodecPriority(BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                        | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_16
+                        | BluetoothCodecConfig.BITS_PER_SAMPLE_24)
+                .setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO)
+                .build();
+        mCodecConfigAPTX = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX)
+                .build();
+        mCodecConfigAPTXHD = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD)
+                .build();
+        mCodecConfigLDAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null,
+                        Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
         mController.writeConfigurationValues(0);
@@ -118,7 +141,8 @@
     public void writeConfigurationValues_checkCodec() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC, mCodecConfigAPTX,
                 mCodecConfigAPTXHD, mCodecConfigLDAC, mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigSBC, null,
+                        Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
 
@@ -145,7 +169,8 @@
     public void writeConfigurationValues_resetHighestConfig() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC, mCodecConfigAPTX,
                 mCodecConfigAPTXHD, mCodecConfigLDAC, mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                        Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.writeConfigurationValues(2);
@@ -172,4 +197,37 @@
 
         verify(mCallback).onBluetoothCodecChanged();
     }
+
+    @Test
+    public void onHDAudioEnabled_optionalCodecEnabled_setsCodecTypeAsAAC() {
+        List<BluetoothCodecConfig> mCodecConfigs = Arrays.asList(mCodecConfigAAC, mCodecConfigSBC);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC,
+                /* codecsLocalCapabilities= */ null,
+                mCodecConfigs);
+        when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onHDAudioEnabled(/* enabled= */ true);
+
+        verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecType(
+                eq(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC));
+    }
+    @Test
+    public void onHDAudioEnabled_optionalCodecDisabled_setsCodecTypeAsSBC() {
+        List<BluetoothCodecConfig> mCodecConfigs = Arrays.asList(mCodecConfigAAC, mCodecConfigSBC);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC,
+                /* codecsLocalCapabilities= */ null,
+                mCodecConfigs);
+        when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
+        when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
+                BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED);
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onHDAudioEnabled(/* enabled= */ false);
+
+        verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecType(
+                eq(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
index 60476de..72ceddf 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothHDAudioPreferenceControllerTest.java
@@ -18,12 +18,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -43,6 +46,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowBluetoothDevice;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothDevice.class})
 public class BluetoothHDAudioPreferenceControllerTest {
@@ -52,6 +58,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private AbstractBluetoothPreferenceController.Callback mCallback;
@@ -73,6 +81,7 @@
         mBluetoothA2dpConfigStore = spy(new BluetoothA2dpConfigStore());
         mController = new BluetoothHDAudioPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore, mCallback);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new SwitchPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
@@ -81,7 +90,8 @@
 
     @Test
     public void updateState_noActiveDevice_setDisable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(null);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Collections.emptyList());
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
 
@@ -90,7 +100,8 @@
 
     @Test
     public void updateState_codecSupported_setEnable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -101,7 +112,8 @@
 
     @Test
     public void updateState_codecNotSupported_setDisable() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -112,7 +124,8 @@
 
     @Test
     public void updateState_codecSupportedAndEnabled_checked() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
@@ -125,7 +138,8 @@
 
     @Test
     public void updateState_codecSupportedAndDisabled_notChecked() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         when(mBluetoothA2dp.isOptionalCodecsSupported(mActiveDevice)).thenReturn(
                 mBluetoothA2dp.OPTIONAL_CODECS_SUPPORTED);
         when(mBluetoothA2dp.isOptionalCodecsEnabled(mActiveDevice)).thenReturn(
@@ -138,7 +152,8 @@
 
     @Test
     public void onPreferenceChange_disable_verifyFlow() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         final boolean enabled = false;
         mController.onPreferenceChange(mPreference, enabled);
@@ -151,7 +166,8 @@
 
     @Test
     public void onPreferenceChange_enable_verifyFlow() {
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         final boolean enabled = true;
         mController.onPreferenceChange(mPreference, enabled);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
index ef209a2..1bd83f7 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -43,6 +45,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.Arrays;
+
 @RunWith(RobolectricTestRunner.class)
 public class BluetoothQualityDialogPreferenceControllerTest {
 
@@ -51,6 +55,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothQualityDialogPreferenceController mController;
@@ -74,22 +80,22 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = new BluetoothQualityDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore);
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothQualityDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigLDAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_96000,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                1001, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                        | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .build();
+        mCodecConfigLDAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000)
+                .setCodecSpecific1(1001)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
@@ -116,7 +122,8 @@
     @Test
     public void updateState_codeTypeIsLDAC_enablePreference() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigLDAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigLDAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
@@ -127,7 +134,8 @@
     @Test
     public void updateState_codeTypeAAC_disablePreference() {
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigLDAC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
index c649fdf..f7d010c 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -44,6 +46,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
@@ -54,6 +57,8 @@
     @Mock
     private BluetoothA2dp mBluetoothA2dp;
     @Mock
+    private BluetoothAdapter mBluetoothAdapter;
+    @Mock
     private PreferenceScreen mScreen;
 
     private BluetoothSampleRateDialogPreferenceController mController;
@@ -78,29 +83,31 @@
         mActiveDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(DEVICE_ADDRESS);
         mController = spy(new BluetoothSampleRateDialogPreferenceController(mContext, mLifecycle,
                 mBluetoothA2dpConfigStore));
+        mController.mBluetoothAdapter = mBluetoothAdapter;
         mPreference = new BluetoothSampleRateDialogPreference(mContext);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
-        mCodecConfigAAC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_48000 | BluetoothCodecConfig.SAMPLE_RATE_88200,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
-                BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT,
-                BluetoothCodecConfig.SAMPLE_RATE_96000,
-                BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
-                BluetoothCodecConfig.CHANNEL_MODE_NONE,
-                0, 0, 0, 0);
-        when(mBluetoothA2dp.getActiveDevice()).thenReturn(mActiveDevice);
+        mCodecConfigAAC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_48000
+                                | BluetoothCodecConfig.SAMPLE_RATE_88200)
+                .build();
+        mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_96000)
+                .build();
+        when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.A2DP)))
+                .thenReturn(Arrays.asList(mActiveDevice));
     }
 
     @Test
     public void writeConfigurationValues_selectDefault_setHighest() {
-        mCodecConfigSBC = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);
+        BluetoothCodecConfig mCodecConfigSBC = new BluetoothCodecConfig.Builder()
+                .setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
+                .build();
         BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
-        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
+        mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null,
+                Arrays.asList(mCodecConfigs));
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
         mController.onBluetoothServiceConnected(mBluetoothA2dp);
@@ -132,7 +139,10 @@
 
     @Test
     public void getSelectableIndex_verifyList() {
-        BluetoothCodecConfig[] mCodecConfigs = {mCodecConfigAAC, mCodecConfigSBC};
+        List<BluetoothCodecConfig> mCodecConfigs = new ArrayList() {{
+                    add(mCodecConfigAAC);
+                    add(mCodecConfigSBC);
+                }};
         mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, mCodecConfigs);
         when(mBluetoothA2dp.getCodecStatus(
             mActiveDevice)).thenReturn(mCodecStatus);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
index 43bda4e3..a3be60d 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
@@ -26,10 +26,10 @@
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
 import android.content.Intent;
-import android.net.TrafficStats;
 import android.provider.Settings;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.util.DataUnit;
 
 import androidx.preference.SwitchPreference;
 
@@ -128,7 +128,7 @@
     public void updateState_shouldUseIECUnit() {
         final DataUsageController.DataUsageInfo usageInfo =
                 new DataUsageController.DataUsageInfo();
-        usageInfo.usageLevel = TrafficStats.MB_IN_BYTES;
+        usageInfo.usageLevel = DataUnit.MEBIBYTES.toBytes(1);
         doReturn(usageInfo).when(mController).getDataUsageInfo(any());
 
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index a3c2535..74bddda 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -74,12 +74,12 @@
 
     private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
     private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
+    private static final String PREFERENCE_NO_OPTIONS_DESC = "no_options_description";
     private static final String TEST_EMERGENCY_ADDRESS_CARRIER_APP =
             "com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp";
 
     private TestFragment mFragment;
     private Context mContext;
-    private TextView mEmptyView;
     private final PersistableBundle mBundle = new PersistableBundle();
 
     private MockWifiCallingQueryImsState mQueryImsState;
@@ -100,6 +100,8 @@
     @Mock
     private View mView;
     @Mock
+    private LinkifyDescriptionPreference mDescriptionView;
+    @Mock
     private ListWithEntrySummaryPreference mButtonWfcMode;
     @Mock
     private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@@ -126,12 +128,10 @@
         doReturn(mock(ListWithEntrySummaryPreference.class)).when(mFragment).findPreference(any());
         doReturn(mButtonWfcMode).when(mFragment).findPreference(BUTTON_WFC_MODE);
         doReturn(mButtonWfcRoamingMode).when(mFragment).findPreference(BUTTON_WFC_ROAMING_MODE);
+        doReturn(mDescriptionView).when(mFragment).findPreference(PREFERENCE_NO_OPTIONS_DESC);
         doNothing().when(mFragment).finish();
         doReturn(mView).when(mFragment).getView();
 
-        mEmptyView = new TextView(mContext);
-        doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
-
         mSwitchBar = new SettingsMainSwitchBar(mContext);
         doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
 
@@ -211,8 +211,7 @@
         mFragment.onResume();
 
         // Check that WFC roaming preference is shown.
-        verify(mPreferenceScreen, times(1)).addPreference(mButtonWfcRoamingMode);
-        verify(mPreferenceScreen, never()).removePreference(mButtonWfcRoamingMode);
+        verify(mButtonWfcRoamingMode, times(1)).setVisible(true);
     }
 
     @Test
@@ -225,8 +224,7 @@
         mFragment.onResume();
 
         // Check that WFC roaming preference is hidden.
-        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
-        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
+        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
     }
 
     @Test
@@ -239,8 +237,7 @@
         mFragment.onResume();
 
         // Check that WFC roaming preference is hidden.
-        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
-        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
+        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
     }
 
     @Test
@@ -253,8 +250,7 @@
         mFragment.onResume();
 
         // Check that WFC roaming preference is hidden.
-        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
-        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
+        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
     }
 
     @Test
@@ -332,9 +328,9 @@
                 Activity.RESULT_OK, null);
 
         // Check the WFC preferences is added.
-        verify(mPreferenceScreen).addPreference(mButtonWfcMode);
-        verify(mPreferenceScreen).addPreference(mButtonWfcRoamingMode);
-        verify(mPreferenceScreen).addPreference(mUpdateAddress);
+        verify(mButtonWfcMode).setVisible(true);
+        verify(mButtonWfcRoamingMode).setVisible(true);
+        verify(mUpdateAddress).setVisible(true);
         // Check the WFC enable request.
         verify(mImsMmTelManager).setVoWiFiSettingEnabled(true);
     }
diff --git a/tests/unit/src/com/android/settings/biometrics/OWNERS b/tests/unit/src/com/android/settings/biometrics/OWNERS
new file mode 100644
index 0000000..a257ed8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/biometrics/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/biometrics/OWNERS
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index d770aba..b80e9d2 100644
--- a/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -101,8 +101,7 @@
     }
 
     private NetworkPolicy getDefaultNetworkPolicy() {
-        NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */);
+        NetworkTemplate template = new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
         int cycleDay  = -1;
         String cycleTimezone = "UTC";
         long warningBytes = -1;
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 7d814b5..b27591e 100644
--- a/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -531,13 +531,11 @@
 
         final Bundle expect = new Bundle(1);
         expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
-                NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
-                null /* subscriberId */));
+                new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
         final Bundle actual = startedIntent
                 .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
         assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
-                .isEqualTo(NetworkTemplate.buildTemplateWifi(
-                NetworkTemplate.WIFI_NETWORKID_ALL, null /* subscriberId */));
+                .isEqualTo(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
 
         assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
                 .isEqualTo(ResourcesUtils.getResourcesId(mContext, "string", "wifi_data_usage"));
diff --git a/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java
new file mode 100644
index 0000000..914d01d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/NfcStackDebugLogPreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.NfcStackDebugLogPreferenceController
+        .NFC_STACK_DEBUGLOG_ENABLED_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.SystemProperties;
+
+import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class NfcStackDebugLogPreferenceControllerTest {
+
+    private Context mContext;
+    private NfcStackDebugLogPreferenceController mController;
+    private SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new NfcStackDebugLogPreferenceController(mContext);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new SwitchPreference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        screen.addPreference(mPreference);
+        mController.displayPreference(screen);
+    }
+
+    @Test
+    public void onPreferenceChanged_settingDisabled_shouldTurnOffNfcStackDebugLog() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+
+        assertThat(mode).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChanged_settingEnabled_shouldTurnOnNfcStackDebugLog() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
+
+        assertThat(mode).isTrue();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                Boolean.toString(true));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                Boolean.toString(false));
+
+        mController.updateState(mPreference);
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+        final boolean mode = SystemProperties.getBoolean(
+                NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
+                false /* default */);
+
+        mController.updateState(mPreference);
+
+        assertThat(mode).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index dfe2bc0..5360dac 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -54,6 +54,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
 import android.telephony.euicc.EuiccManager;
 
 import androidx.lifecycle.LifecycleOwner;
@@ -73,6 +74,7 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -387,17 +389,34 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                   // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",     // iccId
+                                0,                   // portIdx
+                                0,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 null,                                   // eid (unavailable)
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                             // isRemovable
+                false,
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                1,                   // portIdx
+                                1,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -427,17 +446,31 @@
                 true,                                   // isEuicc
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,
+                Collections.singletonList(new UiccPortInfo(
+                        null,                                 // iccId
+                        0,                                  // portIdx
+                        0,                             // logicalSlotIdx
+                        true                              // isActive
+                )));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 false,                                  // isEuicc
                 1,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 1,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                             // isRemovable
+                false,           // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",      // iccId
+                                1,                    // portIdx
+                                1,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -468,17 +501,34 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                             // isRemovable
+                false,             // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",       // iccId
+                                1,                     // portIdx
+                                1,                // logicalSlotIdx
+                                true                 // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 null,                                   // eid (unavailable)
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,             // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                   // iccId
+                                1,                    // portIdx
+                                1,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -511,17 +561,33 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,              // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",        // iccId
+                                0,                      // portIdx
+                                0,                 // logicalSlotIdx
+                                true                  // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo1);
         UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
                 true,                                   // isEuicc
                 1,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
                 1,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                1,                   // portIdx
+                                1,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo2);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -552,9 +618,17 @@
                 true,                                   // isEuicc
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                  // iccId
+                                0,                   // portIdx
+                                0,              // logicalSlotIdx
+                                true               // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -583,9 +657,18 @@
                 true,                                   // isEuicc (eUICC slot is selected)
                 0,                                      // cardId
                 TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
                 0,                                      // slotIndex
-                false);                                 // isRemovable
+                false,                                 // isRemovable
+                false,               // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                null,                // iccId
+                                0,                 // portIdx
+                                0,            // logicalSlotIdx
+                                true             // isActive
+                        )
+                )
+        );
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -616,9 +699,18 @@
                 false,                                  // isEuicc (eUICC slot is not selected)
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,            // isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",        // iccId
+                                0,                      // portIdx
+                                0,                 // logicalSlotIdx
+                                true                  // isActive
+
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
@@ -649,9 +741,17 @@
                 false,                                  // isEuicc
                 0,                                      // cardId
                 null,                                   // eid
-                "123451234567890",                      // iccid
                 0,                                      // slotIndex
-                true);                                  // isRemovable
+                true,                                  // isRemovable
+                false,           //isMultipleEnabledProfileSupported
+                Collections.singletonList(
+                        new UiccPortInfo(
+                                "123451234567890",      // iccId
+                                0,                    // portIdx
+                                0,               // logicalSlotIdx
+                                true                // isActive
+                        )
+                ));
         uiccCardInfos.add(uiccCardInfo);
         when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
 
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 671da95..cad68e1 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -33,9 +33,9 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.net.TrafficStats;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.DataUnit;
 import android.util.SparseArray;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -62,7 +62,7 @@
     private static final String PACKAGE_NAME_1 = "com.blah.test";
     private static final String PACKAGE_NAME_2 = "com.blah.test2";
     private static final String PACKAGE_NAME_3 = "com.blah.test3";
-    private static final long DEFAULT_QUOTA = 64 * TrafficStats.MB_IN_BYTES;
+    private static final long DEFAULT_QUOTA = DataUnit.MEBIBYTES.toBytes(64);
 
     @Mock
     private StorageStatsSource mSource;
diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
index 81841b7..20f8a55 100644
--- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
 import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
 import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA;
@@ -32,6 +33,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -154,6 +157,30 @@
 
     @UiThreadTest
     @Test
+    public void getAvailabilityStatus_callStateIsIdle_returnAvailable() {
+        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mController.getTelephonyCallback().onCallStateChanged(TelephonyManager.CALL_STATE_IDLE);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertTrue(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    public void getAvailabilityStatus_duringCalling_returnAvailable() {
+        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mController.getTelephonyCallback().onCallStateChanged(TelephonyManager.CALL_STATE_OFFHOOK);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+        assertFalse(mPreference.isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
     public void updateState_LteWorldPhone_GlobalHasLte() {
         mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
 
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
index 879b9f7..e3fea83 100644
--- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -26,6 +26,7 @@
 import com.android.settings.core.BasePreferenceController;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -42,6 +43,7 @@
         mController = new EraseEuiccDataController(context, ERASE_EUICC_DATA_PREFERENCE_KEY);
     }
 
+    @Ignore("Will not work on devices without FEATURE_TELEPHONY_EUICC")
     @Test
     public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
         assertThat(mController.getAvailabilityStatus())
diff --git a/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java b/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java
new file mode 100644
index 0000000..36532a1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/helper/QuerySimSlotIndexTest.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network.helper;
+
+import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.telephony.TelephonyManager;
+import android.telephony.UiccPortInfo;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicIntegerArray;
+
+@RunWith(AndroidJUnit4.class)
+public class QuerySimSlotIndexTest {
+    private static final String TAG = "QSSI_Test";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    Future<AtomicIntegerArray> mActiveSimSlotIndex;
+    Future<AtomicIntegerArray> mAllSimSlotIndex;
+
+    @Before
+    public void setUp() {
+        // query in background thread
+        mAllSimSlotIndex = ThreadUtils.postOnBackgroundThread(
+                new QuerySimSlotIndex(mTelephonyManager, true, true));
+        // query in background thread
+        mActiveSimSlotIndex = ThreadUtils.postOnBackgroundThread(
+                new QuerySimSlotIndex(mTelephonyManager, false, true));
+    }
+
+    @Test
+    public void allSimSlotIndexCall_nullInput_getNoneNullEmptyList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(null);
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_oneSimAndActivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_oneSimAndActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActivePsimActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndtwoActiveEsims_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_twoActiveEsims());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActivePsimInactiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimInactiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void allSimSlotIndexCall_twoSimsAndActiveEsimInactivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActiveEsimInactivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_nullInput_getNoneNullEmptyList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(null);
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_oneSimAndActivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_oneSimAndActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(oneSim_ActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActivePsimActiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimActiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndtwoActiveEsims_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_twoActiveEsims());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(2);
+            assertThat(result.get(0)).isEqualTo(0);
+            assertThat(result.get(1)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActivePsimInactiveEsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActivePsimInactiveEsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(0);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    @Test
+    public void activeSimSlotIndexCall_twoSimsAndActiveEsimInactivePsim_getList() {
+        try {
+            when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(twoSims_ActiveEsimInactivePsim());
+            List<Integer> result = SelectableSubscriptions.atomicToList(mActiveSimSlotIndex.get());
+
+            assertThat(result.size()).isEqualTo(1);
+            assertThat(result.get(0)).isEqualTo(1);
+        } catch (Exception exception) {
+            Log.w(TAG, "Fail to request subIdList", exception);
+        }
+    }
+
+    private UiccSlotInfo[] oneSim_ActivePsim() {
+        return new UiccSlotInfo[]{createUiccSlotInfo(false, 0, true)};
+    }
+
+    private UiccSlotInfo[] oneSim_ActiveEsim() {
+        return new UiccSlotInfo[]{createUiccSlotInfo(true, 1, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActivePsimActiveEsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, true),
+                createUiccSlotInfo(true, 1, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_twoActiveEsims() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfoForTwoEsim(true, true)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActivePsimInactiveEsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, true),
+                createUiccSlotInfo(true, 1, false)};
+    }
+
+    private UiccSlotInfo[] twoSims_ActiveEsimInactivePsim() {
+        return new UiccSlotInfo[]{
+                createUiccSlotInfo(false, 0, false),
+                createUiccSlotInfo(true, 1, true)};
+    }
+
+    //ToDo: add more cases.
+    /*
+    private List<UiccSlotInfo> threeSims_ActivePsimTwoinactiveEsim(){
+    }
+    private List<UiccSlotInfo> threeSims_twoActiveEsimsInactivePsim(){
+    }
+    private List<UiccSlotInfo> threeSims_ActiveEsimInactivePsimInactiveEsim(){
+    }
+    private List<UiccSlotInfo> threeSims_ActivePsimActiveEsimInactiveEsim(){
+    }
+    */
+
+    private UiccSlotInfo createUiccSlotInfo(boolean isEuicc, int logicalSlotIdx,
+            boolean isActive) {
+        return new UiccSlotInfo(
+                isEuicc, /* isEuicc */
+                "123", /* cardId */
+                CARD_STATE_INFO_PRESENT, /* cardStateInfo */
+                true, /* isExtendApduSupported */
+                true, /* isRemovable */
+                Collections.singletonList(
+                        new UiccPortInfo("" /* iccId */, 0 /* portIdx */,
+                                logicalSlotIdx /* logicalSlotIdx */, isActive /* isActive */))
+        );
+    }
+
+    private UiccSlotInfo createUiccSlotInfoForTwoEsim(boolean isActiveEsim1,
+            boolean isActiveEsim2) {
+        return new UiccSlotInfo(
+                true, /* isEuicc */
+                "123", /* cardId */
+                CARD_STATE_INFO_PRESENT, /* cardStateInfo */
+                true, /* isExtendApduSupported */
+                true, /* isRemovable */
+                Arrays.asList(
+                        new UiccPortInfo("" /* iccId */, 0 /* portIdx */,
+                                0 /* logicalSlotIdx */, isActiveEsim1 /* isActive */),
+                        new UiccPortInfo("" /* iccId */, 1 /* portIdx */,
+                                1 /* logicalSlotIdx */, isActiveEsim2 /* isActive */))
+        );
+    }
+}