Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f72aa8e..8b9f368 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -328,7 +328,7 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".wifi.WifiInfo"
+        <activity android:name=".Settings$WifiInfoActivity"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
@@ -337,6 +337,8 @@
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.wifi.WifiInfo" />
         </activity>
 
         <activity android:name=".wifi.WifiConfigInfo"
@@ -350,13 +352,15 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".wifi.WifiAPITest"
+        <activity android:name=".Settings$WifiAPITestActivity"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.wifi.WifiAPITest" />
         </activity>
 
         <activity android:name=".wifi.WifiStatusTest"
@@ -1445,7 +1449,7 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name="IccLockSettings"
+        <activity android:name="Settings$IccLockSettingsActivity"
                 android:label="@string/sim_lock_settings"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:process="com.android.phone">
@@ -1454,6 +1458,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.IccLockSettings" />
         </activity>
 
         <activity android:name="Settings$AccessibilitySettingsActivity"
@@ -1736,7 +1742,7 @@
         <activity android:name=".EncryptionInterstitial"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
-        <activity android:name=".deviceinfo.Status"
+        <activity android:name=".Settings$StatusActivity"
                 android:label="@string/device_status_activity_title"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:process="com.android.phone">
@@ -1745,10 +1751,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.Status" />
         </activity>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
-        <activity android:name=".deviceinfo.SimStatus"
+        <activity android:name=".Settings$SimStatusActivity"
                 android:label="@string/sim_status_title"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:process="com.android.phone">
@@ -1757,10 +1765,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.SimStatus" />
         </activity>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
-        <activity android:name=".deviceinfo.ImeiInformation"
+        <activity android:name=".Settings$ImeiInformationActivity"
                 android:label="@string/imei_information_title"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                 android:process="com.android.phone">
@@ -1769,6 +1779,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.ImeiInformation" />
         </activity>
 
         <activity android:name="Settings$StorageSettingsActivity"
@@ -1873,7 +1885,7 @@
                 android:exported="true"
                 android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
-        <activity android:name="ApnEditor"
+        <activity android:name="Settings$ApnEditorActivity"
                 android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -1887,14 +1899,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.ApnEditor" />
         </activity>
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
                 android:icon="@drawable/ic_settings_development"
                 android:taskAffinity="com.android.settings"
-                android:parentActivityName="Settings"
-                android:enabled="false">
+                android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -2151,11 +2164,13 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="TestingSettings" android:label="@string/testing">
+        <activity android:name="Settings$TestingSettingsActivity" android:label="@string/testing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.TestingSettings" />
         </activity>
 
         <receiver android:name="TestingSettingsBroadcastReceiver">
@@ -2316,10 +2331,13 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"
+        <activity android:name="Settings$ChooseAccountActivity"
             android:label="@string/header_add_an_account"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
+            android:theme="@style/Theme.SubSettingsDialogWhenLarge">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.accounts.ChooseAccountActivity" />
+        </activity>
 
         <activity android:name=".CryptKeeper"
                   androidprv:systemUserOnly="true"
@@ -2439,8 +2457,7 @@
         <activity android:name="Settings$PaymentSettingsActivity"
                 android:label="@string/nfc_payment_settings_title"
                 android:icon="@drawable/ic_settings_nfc_payment"
-                android:taskAffinity=""
-                android:enabled="false">
+                android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2725,7 +2742,6 @@
         <activity android:name="Settings$SimSettingsActivity"
                 android:label="@string/sim_settings_title"
                 android:icon="@drawable/ic_settings_sim"
-                android:enabled="false"
                 android:taskAffinity="">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
diff --git a/res/layout/icc_lock_tabs.xml b/res/layout/icc_lock_tabs.xml
index 79b9660..d62f595 100644
--- a/res/layout/icc_lock_tabs.xml
+++ b/res/layout/icc_lock_tabs.xml
@@ -47,7 +47,7 @@
             android:layout_height="0dip" />
 
         <FrameLayout
-            android:id="@+id/main_content"
+            android:id="@+id/prefs_container"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4e5d7ff..292f8d4 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Oudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gekaste data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Ander"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Stelsel"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Verken <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Ander sluit in gedeelde lêers wat deur programme gestoor is, lêers wat van die internet of Bluetooth af afgelaai is, Android-lêers en so meer. \n\nTik op Verken om al die inhoud van hierdie <xliff:g id="NAME">^1</xliff:g> te sien."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Stelsel sluit lêers in wat die Android-bedryfstelsel intern gebruik. \n\nHierdie lêers kan nie individueel bekyk word nie."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> het dalk foto\'s, musiek, flieks, programme of ander data gestoor wat <xliff:g id="SIZE">^2</xliff:g> van die berging opneem. \n\nSkakel oor na <xliff:g id="USER_1">^1</xliff:g> om besonderhede te sien."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Stel jou <xliff:g id="NAME">^1</xliff:g> op"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruik as draagbare berging"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Regsinligting"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bydraers"</string>
     <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulerende inligting"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulerende etikette"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Veiligheid- en regulerende inligting"</string>
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Bepalings en voorwaardes"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-datagebruik"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> se sellulêre data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> se Wi-Fi-data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> se ethernet-data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing / <xliff:g id="ID_2">%2$s</xliff:g>-datalimiet"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringsiklus"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Stel op"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ander programme wat by gebruik ingesluit is"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> programme word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
       <item quantity="one">1 program word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index bc0798d..58a1a03 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ኦዲዮ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"የተሸጎጠ ውሂብ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ሌላ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ሥርዓት"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ይመርምሩ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ሌላ በመተግበሪያዎች፣ ከበይነመረቡ ወይም ብሉቱዝ የወረዱ ፋይሎች፣ የAndroid ፋይሎች እና የመሳሰሉትን ያካትታል። \n\nመላውን የዚህ <xliff:g id="NAME">^1</xliff:g> ይዘቶችን ለማየት አስስን ነካ ያድርጉ።"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ሥርዓት በAndroid ሥርዓተ ክወና በውስጣዊ መንገድ ጥቅም ላይ የዋሉ ፋይሎችን ያካትታል። \n\nእነዚህ ፋይሎች በተናጠል ሊታዩ አይችሉም።"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ፎቶዎች፣ ሙዚቃ፣ ፊልሞች፣ ወይም ሌላ ውሂብ <xliff:g id="SIZE">^2</xliff:g> ማከማቻ የያዘ አስቀምጦ ይሆናል። \n\nዝርዝሮች ለመመልከት ወደ ይቀይሩ<xliff:g id="USER_1">^1</xliff:g>።"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"የእርስዎን <xliff:g id="NAME">^1</xliff:g> ያዘጋጁ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"እንደ ተንቀሳቃሽ ማከማቻ ይጠቀሙ"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"የህግ መረጃ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"አዋጮች"</string>
     <string name="manual" msgid="3025943393642974445">"መመሪያ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"የደንብ ክትትል መረጃ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"የመከታተያ መሰየሚያዎች"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"የደህንነት እና ክትትል መረጃ"</string>
     <string name="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ውሎች እና ደንቦች"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"የኤተርኔት ውሂብ አጠቃቀም"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ኤተርኔት"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> የተንቀሳቃሽ ስልክ ውሂብ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi ውሂብ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ኤተርኔት ውሂብ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> የውሂብ ማስጠንቀቂያ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> የውሂብ ማስጠንቀቂያ / <xliff:g id="ID_2">%2$s</xliff:g> የውሂብ ገደብ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"የክፍያ አከፋፈል ዑደት"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"የውሂብ ገደብ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ከ<xliff:g id="ID_2">%2$s</xliff:g> መሃል ጥቅም ላይ ውሏል"</string>
     <string name="configure" msgid="1029654422228677273">"አዋቅር"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"በአጠቃቀም ውስጥ ሌሎች መተግበሪያዎች ተካትተዋል"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ውሂብ ቆጣቢ በሚበራበት ጊዜ ያልተገደበ ውሂብን እንዲጠቀሙ ተፈቅዶላቸዋል</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> መተግበሪያዎች ውሂብ ቆጣቢ በሚበራበት ጊዜ ያልተገደበ ውሂብን እንዲጠቀሙ ተፈቅዶላቸዋል</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 244aefd..badcc79 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1134,8 +1134,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"الصوت"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"البيانات المخزنة مؤقتًا"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"غير ذلك"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"النظام"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏ملفات أخرى تتضمن الملفات التي تمت مشاركتها وحفظتها التطبيقات والملفات التي تم تنزيلها من الإنترنت أو البلوتوث وملفات Android وغير ذلك. \n\nلعرض كامل محتوى <xliff:g id="NAME">^1</xliff:g>، انقر على \"استكشاف\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏يتضمن النظام ملفات يتم استخدامها داخليًا من قِبل نظام التشغيل Android. \n\n ولا يمكن عرض هذه  الملفات كل على حدة."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"يمكن أن يمتلك <xliff:g id="USER_0">^1</xliff:g> صورًا أو موسيقى أو أفلامًا أو تطبيقات أو بيانات أخرى محفوظة وتستهلك سعة تخزينية بمقدار <xliff:g id="SIZE">^2</xliff:g>. \n\nلعرض التفاصيل، عليك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"الاستخدام كوحدة تخزين محمولة"</string>
@@ -1326,7 +1328,8 @@
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
     <string name="contributors_title" msgid="5917703088825286504">"المساهمون"</string>
     <string name="manual" msgid="3025943393642974445">"الكتيب"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"المعلومات التنظيمية"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"التصنيفات التنظيمية"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"الأمان والمعلومات التنظيمية"</string>
     <string name="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
@@ -3128,9 +3131,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"استخدام بيانات إيثرنت"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"إيثرنت"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> من بيانات شبكة الجوّال"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"‏<xliff:g id="ID_1">%1$s</xliff:g> من بيانات Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> بيانات إيثرنت"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات / <xliff:g id="ID_2">%2$s</xliff:g> حد البيانات"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"دورة الفوترة"</string>
@@ -3144,6 +3150,7 @@
     <string name="data_limit" msgid="1885406964934590552">"حد البيانات"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدم خلال الفترة <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"تهيئة"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"التطبيقات الأخرى المضمّنة في الاستخدام"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="zero">هناك <xliff:g id="COUNT">%1$d</xliff:g> تطبيق مسموح له باستخدام البيانات بدون قيود عند تشغيل توفير البيانات</item>
       <item quantity="two">هناك تطبيقان (<xliff:g id="COUNT">%1$d</xliff:g>) مسموح لهما باستخدام البيانات بدون قيود عند تشغيل توفير البيانات</item>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index fc1e1d8..0846df9 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Keşlənmiş data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Digər"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> araşdırın"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Digərlərinə İnternet və ya Bluetooth, Android fayl və s. yerdən endirilmiş tətbiq və fayllarda saxlanılan paylaşılmış fayllar daxildir. \n\nBu <xliff:g id="NAME">^1</xliff:g> adlı kartın bütün kontentinə baxmaq üçün Kəşf edin seçiminə tıklayın."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemin tərkibində Android əməliyyat sistemi tərəfindən internal olaraq istifadə olunmuş fayllar var. \n\nBu fayllara fərdi şəkildə baxıla bilməz."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> yaddaşda <xliff:g id="SIZE">^2</xliff:g> yer tutan foto, musiqi, film, tətbiq və digər datanı saxlamış ola bilər. \n\nDetallara baxmaq üçün <xliff:g id="USER_1">^1</xliff:g> adına keçin."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazını quraşdırın"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Daşınan yaddaş ehtiyatı kimi istifadə edin"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Hüquqi məlumat"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Yazarlar"</string>
     <string name="manual" msgid="3025943393642974445">"Dərslik"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Normativ informasiya"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Tənzimləyici etiketlər"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Təhlükəsizlik və tənzimləyici məlumat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Müəlliflik hüququ"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şərtlər"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet data istifadəsi"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobil data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet datası"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Data xəbərdarlığı"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Data xəbərdarlığı / <xliff:g id="ID_2">%2$s</xliff:g> Data limiti"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Hesablama dövrü"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Data limiti"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiqurasiya edin"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Digər tətbiqlər istifadəyə əlavə edildi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Data Saver aktiv olduğu zaman <xliff:g id="COUNT">%1$d</xliff:g> tətbiqə məhdudlaşdırılmamış data girişini istifadə etməyə icazə verilir</item>
       <item quantity="one">Data Saver aktiv olduğu zaman 1 tətbiqə məhdudlaşdırılmamış data girişini istifadə etməyə icazə verilir</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 49f503b..19b156a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани данни"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Други"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>: Разглеждане"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Категорията „Други“ включва споделените файлове, запазени от приложенията, файловете, изтеглени от интернет или през Bluetooth, тези на Android и др.\n\nЗа да видите цялото съдържание на това хранилище (<xliff:g id="NAME">^1</xliff:g>), докоснете „Разглеждане“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Системата включва файлове, използвани вътрешно от операционната система Android. \n\nТе не могат да се преглеждат поотделно."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Потребителят <xliff:g id="USER_0">^1</xliff:g> може да е запазил снимки, музика, филми, приложения или други данни, които заемат <xliff:g id="SIZE">^2</xliff:g> от хранилището. \n\nЗа да прегледате подробностите, превключете към <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Настройте хранилището (<xliff:g id="NAME">^1</xliff:g>)"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Използване като преносимо хранилище"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правна информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сътрудници"</string>
     <string name="manual" msgid="3025943393642974445">"Ръководство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулативна информация"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулативни етикети"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Инф. за безопасността и норм. изисквания"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Пренос на данни през Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Мобилни данни (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> данни през Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Данни през Ethernet (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Предупреждение за данните: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Предупреждение за данните: <xliff:g id="ID_1">%1$s</xliff:g>/ограничение за данните: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Цикъл на таксуване"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ограничение за данните"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g> за периода <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигуриране"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Други приложения, включени в преноса на данни"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> приложения могат да използват неограничено количество данни при включена Икономия на данни</item>
       <item quantity="one">1 приложение може да използва неограничено количество данни при включена Икономия на данни</item>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 60cdbc3..57c8263 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"অডিও"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ক্যাশে করা ডেটা"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"অন্যান্য"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"সিস্টেম"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> এক্সপ্লোর করুন"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"অন্যগুলির মধ্যে অন্তর্ভুক্ত রয়েছে, অ্যাপ্লিকেশানগুলির দ্বারা সংরক্ষিত ভাগ করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরো অনেক কিছু৷ \n\n<xliff:g id="NAME">^1</xliff:g> এর সমস্ত সামগ্রী দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android অপারেটিং সিস্টেম দ্বারা অভ্যন্তরীণভাবে ব্যবহৃত ফাইলগুলি সিস্টেমে অন্তর্ভুক্ত রয়েছে৷ \n\nএই ফাইলগুলিকে পৃথকভাবে দেখা যাবে না৷"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> এর হয়তো সংরক্ষিত ফটো, সঙ্গীত, চলচ্চিত্র, অ্যাপ্লিকেশান বা অন্যান্য ডেটা যা <xliff:g id="SIZE">^2</xliff:g> সঞ্চয়স্থান নিয়েছে। \n\nবিশদ বিবরণ দেখতে, <xliff:g id="USER_1">^1</xliff:g> -এ পাল্টান।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"আপনার <xliff:g id="NAME">^1</xliff:g> সেট আপ করুন"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
     <string name="contributors_title" msgid="5917703088825286504">"প্রদায়কগণ"</string>
     <string name="manual" msgid="3025943393642974445">"ম্যানুয়াল"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"রেগুলেটরি তথ্য"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"রেগুলেটরি লেবেল"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"নিরাপত্তা ও রেগুলেটরি তথ্য"</string>
     <string name="copyright_title" msgid="865906688917260647">"কপিরাইট"</string>
     <string name="license_title" msgid="1990487604356037871">"লাইসেন্স"</string>
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ইথারনেট ডেটার ব্যবহার"</string>
     <string name="wifi" msgid="1081550856200013637">"ওয়াই-ফাই"</string>
     <string name="ethernet" msgid="6600095783781389720">"ইথারনেট"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> সেলুলার ডেটা"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> ওয়াই-ফাই ডেটা"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ইথারনেট ডেটা"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা / <xliff:g id="ID_2">%2$s</xliff:g> ডেটা সীমা"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"বিলিং চক্র"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ডেটা সীমা"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="configure" msgid="1029654422228677273">"কনফিগার করুন"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ব্যবহারের মধ্যে অন্যান্য অ্যাপ্স অন্তর্ভুক্ত রয়েছে"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">ডেটা সেভার চালু থাকার সময় <xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশানকে অবাধ ডেটা ব্যবহারের অনুমতি দেওয়া হয়েছে</item>
       <item quantity="other">ডেটা সেভার চালু থাকার সময় <xliff:g id="COUNT">%1$d</xliff:g>টি অ্যাপ্লিকেশানকে অবাধ ডেটা ব্যবহারের অনুমতি দেওয়া হয়েছে</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 79ecc84..77b8a86 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Àudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dades desades a la memòria cau"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altres"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"A l\'apartat Altres s\'inclouen fitxers compartits desats per les aplicacions, fitxers baixats d\'Internet o per Bluetooth i fitxers d\'Android, entre d\'altres \n\nPer veure tot el contingut de <xliff:g id="NAME">^1</xliff:g>, toca Explora."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema inclou fitxers que el sistema operatiu Android utilitza internament. \n\nAquests fitxers no es poden veure per separat."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"És possible que <xliff:g id="USER_0">^1</xliff:g> hagi desat fotos, música, pel·lícules, aplicacions o altres dades que ocupen <xliff:g id="SIZE">^2</xliff:g> d\'emmagatzematge. \n\nPer veure\'n detalls, canvia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilitza com a emmagatzematge portàtil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informació legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Col·laboradors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informació de regulació"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetes normatives"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informació normativa i de seguretat"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termes i condicions"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ús de dades Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de dades mòbils"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de dades Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de dades Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> per enviar l\'advertiment sobre l\'ús de dades"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> per enviar l\'advertiment sobre l\'ús de dades / <xliff:g id="ID_2">%2$s</xliff:g> per arribar al límit de dades"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cicle de facturació"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Límit de dades"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilitzats durant el període <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Altres aplicacions que utilitzen dades"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacions poden utilitzar dades sense restricció quan l\'extensió Economitzador de dades està activada</item>
       <item quantity="one">1 aplicació pot utilitzar dades sense restricció quan l\'extensió Economitzador de dades està activada</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 55d2619..4cbc621 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvuk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data uložená v mezipaměti"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Jiné"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Prozkoumat úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Mezi ostatní soubory patří sdílené soubory uložené aplikacemi, soubory stažené z internetu nebo přes Bluetooth, soubory systému Android apod. \n\nChcete-li zobrazit veškerý obsah s názvem <xliff:g id="NAME">^1</xliff:g>, klepněte na Prozkoumat."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systém zahrnuje soubory, které interně používá operační systém Android. \n\nTyto soubory nelze jednotlivě zobrazit."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> může mít uložené fotky, hudbu, filmy, aplikace a další data, která v úložišti zabírají <xliff:g id="SIZE">^2</xliff:g>. \n\nChcete-li zobrazit podrobnosti, přepněte na účet uživatele <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použít jako přenosné úložiště"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Přispěvatelé"</string>
     <string name="manual" msgid="3025943393642974445">"Příručka"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulační informace"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulační štítky"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Bezpečnostní a regulační informace"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Využití dat přes ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobilní data: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> dat přes Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Data přes ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g> / limit dat: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturační cyklus"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limit dat"</string>
     <string name="data_usage_template" msgid="392191945602400904">"V období <xliff:g id="ID_2">%2$s</xliff:g> jste využili <xliff:g id="ID_1">%1$s</xliff:g> dat"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovat"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostatní aplikace zahrnuté do využití"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikace mají povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
       <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikace má povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 16b962b..e133d63 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Lyd"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachelagrede data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Andet"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Åbn <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Andre filer omfatter delte filer, som er gemt af apps, filer, som er downloadet fra internettet eller via Bluetooth, Android-filer osv. \n\nTryk på Åbn for at se alt indhold på dette <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System indeholder filer, der anvendes internt af Androids operativsystem. \n\nDu kan ikke se disse filer hver for sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan have gemt billeder, musik, film, apps og andre data, som bruger <xliff:g id="SIZE">^2</xliff:g> af lagerpladsen. \n\nFå flere oplysninger ved at skifte til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer dit <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Brug som ekstern lagerplads"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bidragydere"</string>
     <string name="manual" msgid="3025943393642974445">"Brugervejledning"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Certificeringer"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiketter for regler"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Oplysninger om sikkerhed og regler"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Forbrug af Ethernet-data"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi-data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet-data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Dataadvarsel"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Dataadvarsel / <xliff:g id="ID_2">%2$s</xliff:g> Datagrænse"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringscyklus"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datagrænse"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> anvendt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apps, der er inkluderet i forbruget"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> app har tilladelse til at anvende ubegrænset data, når datasparefunktionen er slået til</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps har tilladelse til at anvende ubegrænset data, når datasparefunktionen er slået til</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d931c08..7e883a7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audiodateien"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Daten im Cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Andere"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> erkunden"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Andere\" beinhaltet beispielsweise von Apps gespeicherte gemeinsam genutzte Dateien, aus dem Internet oder per Bluetooth heruntergeladene Dateien oder Android-Dateien. \n\nTippe zum Ansehen des gesamten Inhalts von \"<xliff:g id="NAME">^1</xliff:g>\" auf \"Erkunden\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System enthält Dateien, die intern vom Android-Betriebssystem verwendet werden. \n\nDiese Dateien können nicht einzeln aufgerufen werden."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann Fotos, Musik, Filme, Apps oder sonstige Daten gespeichert haben, die <xliff:g id="SIZE">^2</xliff:g> Speicher belegen. \n\nWechsle zum Ansehen von Details zu <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> einrichten"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Als tragbaren Speicher verwenden"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
     <string name="manual" msgid="3025943393642974445">"Handbuch"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatorische Informationen"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulierungslabels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sicherheits- &amp; Regulierungsinformationen"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
@@ -3006,9 +3009,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-Datennutzung"</string>
     <string name="wifi" msgid="1081550856200013637">"WLAN"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> WLAN-Datennutzung"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet-Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>/Datenlimit: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Abrechnungszeitraum"</string>
@@ -3022,6 +3028,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datenlimit"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzt"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurieren"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Weitere bei der Nutzung mitgerechnete Apps"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> Apps dürfen uneingeschränkt Daten verbrauchen, auch wenn der Datensparmodus aktiviert ist</item>
       <item quantity="one">1 App darf uneingeschränkt Daten verbrauchen, auch wenn der Datensparmodus aktiviert ist</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 76e5d14..6288f6b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ήχος"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Δεδομένα κρυφής μνήμης"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Άλλα"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Σύστημα"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Εξερεύνηση <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Η ενότητα \"Άλλα\" περιέχει κοινόχρηστα αρχεία που έχουν αποθηκεύσει οι εφαρμογές, αρχεία που έχετε κατεβάσει από το διαδίκτυο ή αρχεία Bluetooth, Android κ.ο.κ. \n\nΓια να δείτε όλα τα περιεχόμενα αυτής της συσκευής <xliff:g id="NAME">^1</xliff:g>, πατήστε \"Εξερεύνηση\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Το σύστημα περιλαμβάνει αρχεία τα οποία χρησιμοποιούνται εσωτερικά από το λειτουργικό σύστημα Android. \n\nΔεν είναι δυνατή η μεμονωμένη προβολή αυτών των αρχείων."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Ο χρήστης <xliff:g id="USER_0">^1</xliff:g> μπορεί να έχει αποθηκευμένες φωτογραφίες, μουσική, ταινίες, εφαρμογές ή άλλα δεδομένα που καταλαμβάνουν <xliff:g id="SIZE">^2</xliff:g> στο χώρο αποθήκευσης. \n\nΓια να δείτε λεπτομέρειες, κάντε εναλλαγή στο χρήστη <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Ρυθμίστε τη μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Χρήση ως φορητού αποθηκευτικού χώρου"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Νομικές πληροφορίες"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Συνεργάτες"</string>
     <string name="manual" msgid="3025943393642974445">"Εγχειρίδιο χρήσης"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Ρυθμιστικές πληροφορίες"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Ρυθμιστικές ετικέτες"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Πληροφορίες ασφάλειας και κανονισμών"</string>
     <string name="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Χρήση δεδομένων Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένων κινητής τηλεφωνίας"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένων Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένων Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Προειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g> δεδομένων"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Προειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g> δεδομένων / Όριο <xliff:g id="ID_2">%2$s</xliff:g> δεδομένων"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Κύκλος χρέωσης"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Όριο δεδομένων"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g> μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Διαμόρφωση"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Άλλες εφαρμογές που περιλαμβάνονται στη χρήση"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> εφαρμογές επιτρέπεται να χρησιμοποιούν απεριόριστα δεδομένα όταν είναι ενεργή η Εξοικονόμηση δεδομένων</item>
       <item quantity="one">1 εφαρμογή επιτρέπεται να χρησιμοποιεί απεριόριστα δεδομένα όταν είναι ενεργή η Εξοικονόμηση δεδομένων</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 3ec3821..9281ca8 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet data usage"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning / <xliff:g id="ID_2">%2$s</xliff:g> Data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3ec3821..9281ca8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet data usage"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning / <xliff:g id="ID_2">%2$s</xliff:g> Data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3ec3821..9281ca8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cached data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Other"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explore <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files and so on. \n\nTo see the entire contents of this <xliff:g id="NAME">^1</xliff:g>, tap Explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System includes files used internally by the Android operating system. \n\nThese files can’t be viewed individually."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> may have saved photos, music, movies, apps or other data that is taking up <xliff:g id="SIZE">^2</xliff:g> of storage. \n\nTo view details, switch to <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Set up your <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Use as portable storage"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatory labels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Safety &amp; regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet data usage"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Data warning / <xliff:g id="ID_2">%2$s</xliff:g> Data limit"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Billing cycle"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Data limit"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> used between <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configure"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Other apps included in usage"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d8a1456..ffaaaaa 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -448,7 +448,7 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Huella digital y PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Huella digital y contraseña"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
-    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Otro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Otros\" incluye los archivos compartidos que guardan las apps, archivos descargados de Internet o mediante Bluetooth, archivos de Android, etc. \n\nPara ver el contenido completo de <xliff:g id="NAME">^1</xliff:g>, presiona Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema incluye archivos de uso interno del sistema operativo Android. \n\nEstos archivos no pueden verse de forma individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Es posible que el usuario <xliff:g id="USER_0">^1</xliff:g> haya guardado fotos, música, películas, aplicaciones u otros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> de almacenamiento. \n\nPara ver los detalles, cambia al usuario <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar el dispositivo <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como medio de almacenamiento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas reglamentarias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información reglamentaria y de seguridad"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
@@ -2679,8 +2682,8 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingresar PIN de administrador"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activar"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Desactivar"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fijar pantalla"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Cuando está activada, usa la fijación de pantalla para mantener la vista de la pantalla actual.\n\nPara usar la fijación de pantalla:\n\n1. Asegúrate de que la opción esté activada.\n\n2. Abre la pantalla que deseas fijar.\n\n3. Presiona Descripción general.\n\n4. Desliza el dedo hacia arriba y toca el ícono."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar desbloqueo para quitar fijación"</string>
@@ -3002,9 +3005,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Datos móviles: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de datos con Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Datos de Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
@@ -3018,6 +3024,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Datos usados entre <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras apps incluidas en el uso de datos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps tienen permiso para usar datos sin restricción cuando Reducir datos está activada</item>
       <item quantity="one">1 app tiene permiso para usar datos sin restricción cuando Reducir datos está activada</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3561c6d..66bf4e8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Otros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"En Otros se incluyen archivos compartidos almacenados por aplicaciones, archivos descargados de Internet o por Bluetooth, archivos de Android y mucho más. \n\nPara ver todo el contenido de este <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"El sistema incluye archivos utilizados por el sistema operativo Android de forma interna. \n\nEstos archivos no se pueden ver por separado."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> puede tener aplicaciones, películas, música, fotos y otros datos guardados que ocupan un espacio de <xliff:g id="SIZE">^2</xliff:g>. \n\nPara ver información detallada, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como almacenamiento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuidores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas normativas"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información sobre seguridad y normativas"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Condiciones de uso"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Datos móviles: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de datos con Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Datos de Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usados entre el <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Otras aplicaciones incluidas en el uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicaciones pueden usar datos no restringidos cuando el Economizador de Datos está activado</item>
       <item quantity="one">1 aplicación puede usar datos no restringidos cuando el Economizador de Datos está activado</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 2c7172d..50af487 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Heli"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Vahemälus olevad andmed"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Süsteem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Üksuse <xliff:g id="NAME">^1</xliff:g> avastamine"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Muud failid hõlmavad rakenduste salvestatud faile, Internetist või Bluetoothi kaudu alla laaditud faile, Androidi faile jms. \n\nJaotise <xliff:g id="NAME">^1</xliff:g> kogu sisu vaatamiseks puudutage käsku Avasta."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Süsteem sisaldab faile, mida Androidi operatsioonisüsteem kasutab sisemiselt. \n\nNeid faile ei saa üksikult vaadata."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Kasutaja <xliff:g id="USER_0">^1</xliff:g> võib olla salvestanud fotosid, muusikat, filme, rakendusi või teisi andmeid, mis võtavad ruumi <xliff:g id="SIZE">^2</xliff:g>. \n\nÜksikasjade vaatamiseks lülitage kasutajale <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Seadista üksus <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Kasuta kaasaskantava salvestusruumina"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juriidiline teave"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kaasautorid"</string>
     <string name="manual" msgid="3025943393642974445">"Käsitsi"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulatiivteave"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatiivsildid"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Ohutus- ja regulatiivteave"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Etherneti andmekasutus"</string>
     <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobiilset andmesidet"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> WiFi-andmeid"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Etherneti-andmeid"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> – andmemahu hoiatus"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> – andmemahu hoiatus / <xliff:g id="ID_2">%2$s</xliff:g> – andmemahu piirang"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Arveldustsükkel"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Andmemahu piirang"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud vahemikus <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Seadistamine"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Muud kasutusandmetesse kaasatud rakendused"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> rakendusel on lubatud kasutada piiranguteta andmemahtu, kui andmeside mahu säästja on sisse lülitatud</item>
       <item quantity="one">1 rakendusel on lubatud kasutada piiranguteta andmemahtu, kui andmeside mahu säästja on sisse lülitatud</item>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index d878c18..0226c7f 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audioa"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachean gordetako datuak"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Beste datu batzuk"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Arakatu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"\"Beste datu batzuk\" atalean daude aplikazioek gordetako fitxategi partekatuak, Internetetik eta Bluetooth konexioa erabilita deskargatutako fitxategiak, Android fitxategiak eta abar. \n\n<xliff:g id="NAME">^1</xliff:g> unitateko eduki guztiak ikusteko, sakatu \"Arakatu\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android sistema eragileak erabiltzen dituen fitxategiak daude Sistema atalean. \n\n Fitxategi horiek ezin dira banaka ikusi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Baliteke <xliff:g id="USER_0">^1</xliff:g> erabiltzaileak memoriaren <xliff:g id="SIZE">^2</xliff:g> baino gehiago betetzen duten argazkiak, musika, filmak, aplikazioak edo bestelako datuak gorde izana. \n\nXehetasunak ikusteko, hasi saioa <xliff:g id="USER_1">^1</xliff:g> gisa."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguratu <xliff:g id="NAME">^1</xliff:g> memoria"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Erabili biltegiratze-gailu eramangarri gisa"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Lege-informazioa"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kolaboratzaileak"</string>
     <string name="manual" msgid="3025943393642974445">"Eskuliburua"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Arauei buruzko informazioa"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Legezko etiketak"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Segurtasun- eta lege-informazioa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyrighta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizentzia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zehaztapenak eta baldintzak"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet datuen erabilera"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi konexioa"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Datu-konexioko datuak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> (Wi-Fi datuak)"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet datuak: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Datuen-erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>. Datuen muga: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturazio-zikloa"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datuen muga"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> erabili dira (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguratu"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Erabileran eragina duten beste aplikazio batzuk"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikaziok daukate datuak mugarik gabe erabiltzeko baimena, baita datu-aurrezlea aktibatuta dagoenean ere</item>
       <item quantity="one">Aplikazio batek dauka datuak mugarik gabe erabiltzeko baimena, baita datu-aurrezlea aktibatuta dagoenean ere</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d1a9c6e..fade583 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"صوتی"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"داده‌های موجود در حافظه پنهان"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"موارد دیگر"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"سیستم"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"کاوش <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏موارد دیگر شامل فایل‌های به‌اشتراک گذاشته شده‌ای که برنامه‌ها ذخیره کرده‌اند، فایل‌های دانلودشده از اینترنت یا بلوتوث، فایل‌های Android وغیره است. \n\nبرای دیدن کل محتوای این <xliff:g id="NAME">^1</xliff:g>، روی کاوش ضربه بزنید."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏سیستم شامل فایل‌هایی است که مورد استفاده داخلی سیستم عامل Android قرار می‌گیرد. \n\nاین فایل را نمی‌توان به‌صورت جداگانه مشاهده کرد."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ممکن است عکس، موسیقی، فیلم، برنامه یا داده‌های دیگری داشته باشد که <xliff:g id="SIZE">^2</xliff:g> از حافظه را اشغال کرده است. \n\nبرای مشاهده جزئیات، به <xliff:g id="USER_1">^1</xliff:g> جابه‌جا شوید."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> خود را راه‌اندازی کنید"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"استفاده به عنوان فضای ذخیره‌سازی قابل حمل"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"اطلاعات حقوقی"</string>
     <string name="contributors_title" msgid="5917703088825286504">"شرکت کنندگان"</string>
     <string name="manual" msgid="3025943393642974445">"دفترچه راهنما"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"اطلاعات تنظیمی"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"برچسب‌های نظارتی"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"اطلاعات ایمنی و قوانین نظارتی"</string>
     <string name="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"میزان مصرف داده اترنت"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"اترنت"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> داده شبکه تلفن همراه"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"‏<xliff:g id="ID_1">%1$s</xliff:g> داده Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> داده اترنت"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> هشدار داده"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> هشدار داده / <xliff:g id="ID_2">%2$s</xliff:g> محدودیت داده"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"چرخه صورت‌حساب"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"محدودیت داده"</string>
     <string name="data_usage_template" msgid="392191945602400904">"بین <xliff:g id="ID_2">%2$s</xliff:g>، <xliff:g id="ID_1">%1$s</xliff:g> مصرف شده است"</string>
     <string name="configure" msgid="1029654422228677273">"پیکربندی"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"سایر برنامه‌های موجود در مصرف داده"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">هنگام روشن بودن «صرفه‌جویی داده»، <xliff:g id="COUNT">%1$d</xliff:g> برنامه می‌توانند بدون محدودیت از داده‌ها استفاده کند</item>
       <item quantity="other">هنگام روشن بودن «صرفه‌جویی داده»، <xliff:g id="COUNT">%1$d</xliff:g> برنامه می‌توانند بدون محدودیت از داده‌ها استفاده کند</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ef89451..55c2dc7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Välimuistitiedot"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Muu"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Järjestelmä"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Tutki: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Muihin tiedostoihin sisältyvät esimerkiksi sovellusten tallentamat tiedostot, internetistä ja Bluetoothin kautta ladatut tiedostot ja Android-tiedostot. \n\nAvaa <xliff:g id="NAME">^1</xliff:g> selattavaksi valitsemalla Tutki."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Järjestelmätiedostot ovat Android-käyttöjärjestelmän sisäisessä käytössä. \n\nNiitä ei voi näyttää yksittäin."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> voi sisältää tallennettuja valokuvia, musiikkia, elokuvia, sovelluksia tai muita tietoja, jotka vievät <xliff:g id="SIZE">^2</xliff:g> tallennustilaa. \n\nJos haluat nähdä tarkemmat tiedot, valitse <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Määritä <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Käytä kannettavana tallennustilana"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Oikeudelliset tiedot"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Avustajat"</string>
     <string name="manual" msgid="3025943393642974445">"Käyttöopas"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Lakitiedot"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Viranomaismerkinnät"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Turvallisuus- ja lakitiedot"</string>
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-datan käyttö"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobiilidataa"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi-dataa"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet-dataa"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Datavaroitus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datavaroitus <xliff:g id="ID_1">%1$s</xliff:g> / Datankäyttöraja <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Laskutusjakso"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datankäyttöraja"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty välillä <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Määritä"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Muut datan käyttöön laskettavat sovellukset"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> sovellusta saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
       <item quantity="one">1 sovellus saa käyttää rajattomasti dataa, kun Data Saver on käytössä.</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8477ff8..bcba2d1 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Données mises en cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"L’étiquette « Autre » fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou par Bluetooth, aux fichiers Android, etc. \n\n Pour voir l\'intégralité du contenu de la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> », touchez « Explorer »."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Le système comprend des fichiers utilisés sur l\'appareil par le système d\'exploitation Android.\n\nCes fichiers ne peuvent pas être affichés individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur « <xliff:g id="USER_0">^1</xliff:g> » a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte d\'utilisateur « <xliff:g id="USER_1">^1</xliff:g> »."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer votre « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Renseignements juridiques"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributeurs"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Infos réglementaires"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Étiquettes réglementaires"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sécurité et données réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Utilisation de données Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Données cellulaires : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de données Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de données Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g> / Limite de consommation des données : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cycle de facturation"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans l\'utilisation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application est autorisée à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5da9a06..be0b275 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Données en cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Autre"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Le libellé \"Autre\" fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou via le Bluetooth, aux fichiers Android, etc. \n\nPour afficher l\'intégralité du contenu de la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\", appuyez sur \"Explorer\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Le système comprend des fichiers utilisés en interne par le système d\'exploitation Android. \n\nCes derniers ne peuvent pas être consultés individuellement."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"L\'utilisateur \"<xliff:g id="USER_0">^1</xliff:g>\" a peut-être enregistré des photos, de la musique, des films, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte utilisateur \"<xliff:g id="USER_1">^1</xliff:g>\"."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer la mémoire \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaborateurs"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Réglementations"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Libellés réglementaires"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informations sécurité et réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Consommation de données Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de données mobiles"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de données Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de données Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g> / Limite de consommation des données : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cycle de facturation"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite de consommation données"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurer"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Autres applications incluses dans la consommation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application autorisée à utiliser des données illimitées lorsque l\'économiseur de données est activé</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications autorisées à utiliser des données illimitées lorsque l\'économiseur de données est activé</item>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 4f43a26..f8b934b 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datos almacenados en caché"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Entre outros ficheiros inclúense os compartidos que gardaron as aplicacións, os ficheiros descargados de Internet ou Bluetooth, os ficheiros de Android, etc. \n\nPara ver o contido completo de <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclúe ficheiros que utiliza de forma interna o sistema operativo de Android. \n\nEstes ficheiros non se poden visualizar de individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É posible que <xliff:g id="USER_0">^1</xliff:g> teña gardadas fotos, música, películas, aplicacións ou outros datos que están ocupando <xliff:g id="SIZE">^2</xliff:g> de almacenamento. \n\nPara ver os detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura a túa <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como almacenamento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Información normativa"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas normativas"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Información normativa e de seguranza"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condicións"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wifi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de datos móbiles"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de datos wifi usados"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de datos de Ethernet usados"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Límite de datos"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Datos usados no período do <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicacións incluídas no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacións poden usar datos sen restricións cando o Economizador de datos está activado</item>
       <item quantity="one">1 aplicación pode usar datos sen restricións cando o Economizador de datos está activado</item>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index e985845..8b7d830 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ઑડિઓ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"કેશ્ડ ડેટા"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"અન્ય"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"સિસ્ટમ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> નું અન્વેષણ કરો"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા Bluetooth માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની સંપૂર્ણ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"સિસ્ટમમાં Android ઓપરેટિંગ સિસ્ટમ દ્વારા આંતરિક રીતે ઉપયોગ થયેલ ફાઇલોનો સમાવેશ થાય છે. \n\nઆ ફાઇલો વ્યક્તિગત રીતે જોઈ શકાતી નથી."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજ લેતાં હોય તેવા ફોટા, સંગીત, મૂવીઝ, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે. \n\nવિગતો જોવા માટે, <xliff:g id="USER_1">^1</xliff:g> પર સ્વિચ કરો."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરો"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"પોર્ટેબલ સંગ્રહ તરીકે ઉપયોગ કરો"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"કાનૂની માહિતી"</string>
     <string name="contributors_title" msgid="5917703088825286504">"સહયોગકર્તાઓ"</string>
     <string name="manual" msgid="3025943393642974445">"મેન્યુઅલ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"નિયમનકારી માહિતી"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"નિયમનકારી લેબલ્સ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"સુરક્ષા અને નિયમનકારી માહિતી"</string>
     <string name="copyright_title" msgid="865906688917260647">"કોપિરાઇટ"</string>
     <string name="license_title" msgid="1990487604356037871">"લાઇસન્સ"</string>
     <string name="terms_title" msgid="7697580845616764642">"નિયમો અને શરતો"</string>
@@ -3006,9 +3009,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ઇથરનેટ ડેટા વપરાશ"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ઇથરનેટ"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> સેલ્યુલર ડેટા"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi ડેટા"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ઇથરનેટ ડેટા"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા ચેતવણી / <xliff:g id="ID_2">%2$s</xliff:g> ડેટા મર્યાદા"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"બિલિંગ સાયકલ"</string>
@@ -3022,6 +3028,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ડેટા મર્યાદા"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ડેટા <xliff:g id="ID_2">%2$s</xliff:g> ની વચ્ચે ઉપયોગ થયો"</string>
     <string name="configure" msgid="1029654422228677273">"ગોઠવો"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"વપરાશમાં અન્ય ઍપ્લિકેશનોનો સમાવેશ થાય છે"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">જ્યારે ડેટા સેવર ચાલુ હોય ત્યારે <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશનને અપ્રતિબંધિત ડેટાનો ઉપયોગ કરવાની મંજૂરી છે</item>
       <item quantity="other">જ્યારે ડેટા સેવર ચાલુ હોય ત્યારે <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશનને અપ્રતિબંધિત ડેટાનો ઉપયોગ કરવાની મંજૂરી છે</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 101d432..617f070 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"संग्रहीत डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्‍सप्‍लोर करें"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्य में ऐप्स द्वारा सहेजी गईं साझा फ़ाइलें, इंटरनेट या ब्लूटूथ से डाउनलोड की गईं फ़ाइलें, Android फ़ाइलें आदि शामिल हैं. \n\nइस <xliff:g id="NAME">^1</xliff:g> की संपूर्ण सामग्री देखने के लिए, एक्सप्लोर करें पर टैप करें."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"सिस्टम में Android ऑपरेटिंग सिस्टम द्वारा आंतरिक रूप से उपयोग की जाने वाली फ़ाइलें शामिल हैं. \n\nइन फ़ाइलों को अलग-अलग नहीं देखा जा सकता."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> में सहेजी गई फ़ोटो, संगीत, फ़िल्‍में, ऐप्‍स या अन्‍य डेटा हो सकता है जो <xliff:g id="SIZE">^2</xliff:g> संग्रहण का उपयोग कर रहा है. \n\nविवरण देखने के लिए, <xliff:g id="USER_1">^1</xliff:g> में स्‍विच करें."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"अपना <xliff:g id="NAME">^1</xliff:g> सेट करें"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल मेमोरी के रूप में उपयोग करें"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कानूनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ता"</string>
     <string name="manual" msgid="3025943393642974445">"मैन्युअल"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"विनियामक जानकारी"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक लेबल"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा और नियामक जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ईथरनेट डेटा उपयोग"</string>
     <string name="wifi" msgid="1081550856200013637">"वाई-फ़ाई"</string>
     <string name="ethernet" msgid="6600095783781389720">"ईथरनेट"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> सेल्युलर डेटा"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> वाई-फ़ाई डेटा"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ईथरनेट डेटा"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"डेटा सीमा"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> के बीच <xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="configure" msgid="1029654422228677273">"कॉन्फ़िगर करें"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"उपयोग में शामिल अन्य ऐप्लिकेशन"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">डेटा बचतकर्ता चालू होने पर <xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स को अप्रतिबंधित डेटा का उपयोग करने की अनुमति है</item>
       <item quantity="other">डेटा बचतकर्ता चालू होने पर <xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स को अप्रतिबंधित डेटा का उपयोग करने की अनुमति है</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 322411c..d25f9e7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1104,8 +1104,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audiozapisi"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Podaci iz predmemorije"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Ostalo"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sustav"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Ostalo uključuje dijeljene datoteke koje su spremile aplikacije, datoteke preuzete s interneta ili Bluetoothom, Android datoteke i tako dalje. \n\nDa biste vidjeli sve što <xliff:g id="NAME">^1</xliff:g> sadrži, dodirnite Istraži."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sustav uključuje datoteke koje se interno upotrebljavaju u operativnom sustavu Android. \n\nTe se datoteke ne mogu prikazati pojedinačno."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Korisnik <xliff:g id="USER_0">^1</xliff:g> možda ima spremljene fotografije, glazbu, filmove, aplikacije ili druge podatke koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> prostora za pohranu. \n\nZa prikaz pojedinosti prijeđite na korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Postavite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Upotrebljavaj kao prijenosnu pohranu"</string>
@@ -1296,7 +1298,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Suradnici"</string>
     <string name="manual" msgid="3025943393642974445">"Priručnik"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informacije o propisima"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulatorne oznake"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacije o sigurnosti i propisima"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
@@ -3035,9 +3038,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Potrošnja ethernet podataka"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobilnih podataka"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi podataka"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet podataka"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Upozorenje o potrošnji podataka za <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozorenje o potrošnji podataka za <xliff:g id="ID_1">%1$s</xliff:g>/Podaci su ograničeni na <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciklus naplate"</string>
@@ -3051,6 +3057,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje podataka"</string>
     <string name="data_usage_template" msgid="392191945602400904">"U razdoblju <xliff:g id="ID_2">%2$s</xliff:g> potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriraj"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c6acdf1..6466e3e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Hang"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gyorsítótárazott adatok"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Egyéb"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Rendszer"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> felfedezése"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Az Egyéb kategóriába tartoznak az alkalmazások által mentett megosztott fájlok, az internetről, illetve Bluetooth-kapcsolaton keresztül letöltött fájlok, az androidos fájlok stb. \n\nAz adathordozó (<xliff:g id="NAME">^1</xliff:g>) teljes tartalmának megtekintéséhez érintse meg a Felfedezés lehetőséget."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"A rendszer az Android operációs rendszer által belsőleg használt fájlokat is tartalmaz. \n\nEzeket a fájlokat nem lehet önmagukban megtekinteni."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"A(z) <xliff:g id="USER_0">^1</xliff:g> által esetlegesen mentett fotók, zenék, filmek, alkalmazások és más adatok <xliff:g id="SIZE">^2</xliff:g> tárhelyet foglalnak. \n\nA részletek megtekintéséhez váltson át <xliff:g id="USER_1">^1</xliff:g> felhasználóra."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> – beállítás"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Használat hordozható tárolóként"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Jogi információk"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Közreműködők"</string>
     <string name="manual" msgid="3025943393642974445">"Útmutató"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Szabályozási információk"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Szabályozási címkék"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Biztonsági és szabályozási információk"</string>
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Adathasználat Ethernet-kapcsolaton"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobiladat-forgalom"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> adathasználat Wi-Fi-kapcsolaton"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> adathasználat Ethernet-kapcsolaton"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> adatforgalmi figyelmeztetés"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> – adatforgalmi figyelmeztetés / <xliff:g id="ID_2">%2$s</xliff:g> – adatforgalom korlátozása"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Számlázási ciklus"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Adatforgalmi korlátozás"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva a következő időszakban: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Beállítás"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Adathasználat – egyéb alkalmazások"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> alkalmazás számára engedélyezett a korlátlan adathasználat, ha az Adatforgalom-csökkentő be van kapcsolva</item>
       <item quantity="one">1 alkalmazás számára engedélyezett a korlátlan adathasználat, ha az Adatforgalom-csökkentő be van kapcsolva</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 68bf676..a2219a8 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ձայն"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Քեշավորված տվյալներ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Այլ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Համակարգ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Ուսումնասիրել <xliff:g id="NAME">^1</xliff:g>-ը"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Այլ ֆայլերը ներառում են հավելվածների կողմից պահված ընդհանուր օգտագործման ֆայլերը, համացանցից կամ Bluetooth-ի միջոցով ներբեռնված ֆայլերը, Android ֆայլերը և այլն: \n\nԱյս <xliff:g id="NAME">^1</xliff:g>-ի ողջ բովանդակությունը դիտելու համար հպեք Ուսումնասիրել կոճակին:"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Համակարգը ներառում է Android օպերացիոն համակարգի կողմից ներսում օգտագործվող ֆայլերը: \n\nԱյդ ֆայլերն առանձին հնարավոր չէ տեսնել:"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>-ը կարող է պարունակել լուսանկարներ, երաժշտություն, հավելվածներ կամ այլ տվյալներ, որոնք զբաղեցնում են հիշողության <xliff:g id="SIZE">^2</xliff:g>: \n\nՄանրամասները տեսնելու համար փոխարկեք <xliff:g id="USER_1">^1</xliff:g> օգտվողին:"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Կարգավորեք ձեր <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Օգտագործել որպես շարժական պահեստ"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Իրավական տեղեկատվություն"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Աջակցողներ"</string>
     <string name="manual" msgid="3025943393642974445">"Ձեռքով"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Կանոնակարգման տեղեկատվություն"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Կանոնակարգող պիտակներ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Անվտանգության և կանոնակարգման տվյալներ"</string>
     <string name="copyright_title" msgid="865906688917260647">"Հեղինակային իրավունք"</string>
     <string name="license_title" msgid="1990487604356037871">"Արտոնագիր"</string>
     <string name="terms_title" msgid="7697580845616764642">"Կանոններն ու պայմանները"</string>
@@ -2679,7 +2682,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Երբ էկրանը միացված կամ անջատված է"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Կարծիք հայտնել այս սարքի մասին"</string>
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Մուտքագրեք կառավարչի PIN-ը"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Միացված"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Անջատված"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet տվյալների օգտագործում"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Բջջային տվյալներ՝ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> տվյալ Wi-Fi-ով"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet տվյալներ` <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g> / Տվյալների օգտագործման սահմանաչափ` <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Հաշիվների ներկայացման ցիկլ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Տվյալների սահմանաչափը"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ժամանակահատվածում օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Կարգավորել"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Օգտագործման մեջ ներառված այլ հավելվածներ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">Երբ Տվյալների խնայումը միացված է, <xliff:g id="COUNT">%1$d</xliff:g> հավելվածին թույլ է տրվում օգտագործել տվյալներն անսահմանափակ</item>
       <item quantity="other">Երբ Տվյալների խնայումը միացված է, <xliff:g id="COUNT">%1$d</xliff:g> հավելվածին թույլ է տրվում օգտագործել տվյալներն անսահմանափակ</item>
@@ -3157,5 +3164,5 @@
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ձեռքով"</string>
     <string name="deletion_helper_preference_title" msgid="7719699175312011449">"Ազատել տարածքը հիմա"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Հիշողության կառավարիչ"</string>
-    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"Ավտոմատ պահման կառավարման ծառայություն"</string>
+    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"Հիշողության ավտոմատ կառավարման ծառայություն"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 531b0b0..68afa07 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data dalam cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Lainnya"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Jelajahi <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Lainnya mencakup file bersama yang disimpan oleh aplikasi, file yang diunduh dari internet atau Bluetooth, file Android, dan sebagainya. \n\nUntuk melihat seluruh konten <xliff:g id="NAME">^1</xliff:g> ini, ketuk Jelajahi."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem mencakup file yang digunakan secara internal oleh sistem operasi Android. \n\nFile ini tidak dapat dilihat satu persatu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, musik, film, aplikasi atau data lain yang menghabiskan <xliff:g id="SIZE">^2</xliff:g> penyimpanan. \n\nUntuk melihat detailnya, beralihlah ke <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Siapkan <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai penyimpanan portabel"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontributor"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informasi pengaturan"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Label peraturan"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informasi peraturan &amp; keselamatan"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Penggunaan data ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Data seluler <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> data Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Data ethernet <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Peringatan data <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Peringatan data <xliff:g id="ID_1">%1$s</xliff:g> / Batas data <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Siklus penagihan"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Batas data"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasi"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikasi lain yang disertakan dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Data aktif</item>
       <item quantity="one">1 aplikasi diizinkan untuk menggunakan data yang tidak dibatasi jika Penghemat Data aktif</item>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 64a5476..51c0a96 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Hljóð"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gögn í skyndiminni"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Annað"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Kerfi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Kanna <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"„Annað“ inniheldur skrár sem hefur verið deilt og skrár sem forrit vista, skrár sóttar af netinu eða með Bluetooth, Android skrár o.s.frv. \n\nTil að sjá allt innihald á <xliff:g id="NAME">^1</xliff:g> skaltu ýta á „Kanna“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Kerfi inniheldur skrár sem Android stýrikerfið notar. \n\nEkki er hægt að skoða hverja skrá fyrir sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kann að hafa vistað myndir, tónlist, kvikmyndir, forrit eða önnur gögn sem nota <xliff:g id="SIZE">^2</xliff:g> af geymslurými. \n\nTil að sjá nánari upplýsingar skaltu skipta yfir á <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setja upp <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Nota sem færanlega geymslu"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Lagalegar upplýsingar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Meðhöfundar"</string>
     <string name="manual" msgid="3025943393642974445">"Handbók"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Lögbundnar upplýsingar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Lögbundnir flokkar"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Öryggis- og lögbundnar upplýsingar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Höfundarréttur"</string>
     <string name="license_title" msgid="1990487604356037871">"Leyfi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Skilmálar"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-gagnanotkun"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> gagnanotkun"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi gögn"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet-gögn"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> gagnaviðvörun"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> gagnaviðvörun / <xliff:g id="ID_2">%2$s</xliff:g> gagnamörk"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Greiðslutímabil"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Gagnamörk"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> notuð milli <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Stilla"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Önnur forrit talin með í notkun"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> forrit má nota ótakmörkuð gögn þegar kveikt er á gagnasparnaði</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> forrit mega nota ótakmörkuð gögn þegar kveikt er á gagnasparnaði</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2486b2a..e195d4e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dati memorizzati nella cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altro"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Esplora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Gli altri sono file condivisi salvati da app, file scaricati da Internet o tramite Bluetooth, file Android e così via. \n\nPer vedere tutti i contenuti di <xliff:g id="NAME">^1</xliff:g>, tocca Esplora."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Il sistema include file utilizzati internamente dal sistema operativo Android. \n\nQuesti file non possono essere visualizzati singolarmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> potrebbe aver salvato foto, musica, film, app o altri dati che occupano <xliff:g id="SIZE">^2</xliff:g> di memoria. \n\nPer i dettagli, passa a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizza come memoria portatile"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
     <string name="manual" msgid="3025943393642974445">"Manuale"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Normative"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etichette normative"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sicurezza e normative"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Utilizzo dei dati Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Rete dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> di dati Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Dati Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Avviso relativo ai dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avviso relativo ai dati: <xliff:g id="ID_1">%1$s</xliff:g>/Limite dati: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo di fatturazione"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite dati"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configura"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Altre app incluse nell\'utilizzo"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <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>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e90b9c7..9cca9b4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"אודיו"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"נתונים בקובץ שמור"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"אחר"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"מערכת"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"עיין ב-<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏אפשרויות אחרות כוללות, בין השאר, קבצים משותפים שנשמרו על ידי אפליקציות, קבצים שהורדו מהאינטרנט או מ-Bluetooth, קובצי  Android וכו\'. \n\nכדי לראות את כל התוכן ב-<xliff:g id="NAME">^1</xliff:g> זה, הקש על \'גלה\'."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏המערכת כוללת קבצים שנעשה בהם שימוש פנימי על ידי מערכת ההפעלה של Android. \n\nלא ניתן להציג קבצים אלה בנפרד."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"ייתכן של-<xliff:g id="USER_0">^1</xliff:g> יש תמונות, מוזיקה, סרטים, אפליקציות או נתונים אחרים שתופסים <xliff:g id="SIZE">^2</xliff:g> מנפח האחסון. \n\nעבור אל <xliff:g id="USER_1">^1</xliff:g> כדי לראות פרטים."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"הגדרת <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"שימוש כאחסון נייד"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
     <string name="contributors_title" msgid="5917703088825286504">"תורמים"</string>
     <string name="manual" msgid="3025943393642974445">"ידני"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"מידע על תקנות"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"תוויות תקינה"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"מידע בנושא בטיחות ותקינה"</string>
     <string name="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
@@ -3068,9 +3071,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"‏שימוש בנתוני Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> של נתונים סלולריים"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"‏<xliff:g id="ID_1">%1$s</xliff:g> נתוני Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"‏<xliff:g id="ID_1">%1$s</xliff:g> של נתוני Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"אזהרה לגבי שימוש בנתונים - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"אזהרה לגבי שימוש בנתונים - <xliff:g id="ID_1">%1$s</xliff:g> / מגבלת שימוש בנתונים - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"מחזור חיובים"</string>
@@ -3084,6 +3090,7 @@
     <string name="data_limit" msgid="1885406964934590552">"מגבלת נתונים"</string>
     <string name="data_usage_template" msgid="392191945602400904">"בתקופה <xliff:g id="ID_2">%2$s</xliff:g> נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"הגדר"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"אפליקציות אחרות שנכללות בנתוני השימוש"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="two">‏מותר להשתמש בנתונים בלתי מוגבלים ב-<xliff:g id="COUNT">%1$d</xliff:g> אפליקציות כשחוסך הנתונים (Data Saver) פועל</item>
       <item quantity="many">‏מותר להשתמש בנתונים בלתי מוגבלים ב-<xliff:g id="COUNT">%1$d</xliff:g> אפליקציות כשחוסך הנתונים (Data Saver) פועל</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2c88f32..ef323aa 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音声"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"キャッシュデータ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"その他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"システム"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>の内容を見る"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"その他のファイルには、アプリが保存した共有ファイル、インターネットや Bluetooth 経由でダウンロードしたファイル、Android ファイルなどが含まれます。\n\nこの「<xliff:g id="NAME">^1</xliff:g>」の全内容を確認するには、[外部メディア] をタップします。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"システムには、Android オペレーティング システムで内部的に使用されているファイルが含まれます。\n\nこのようなファイルは個別に表示することができません。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>が保存した写真、音楽、動画、アプリなどのデータはストレージの<xliff:g id="SIZE">^2</xliff:g>を使用しています。\n\n詳細を表示するには、<xliff:g id="USER_1">^1</xliff:g>に切り替えてください。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>のセットアップ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"外部ストレージとして使用"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法的情報"</string>
     <string name="contributors_title" msgid="5917703088825286504">"アライアンスパートナー"</string>
     <string name="manual" msgid="3025943393642974445">"マニュアル"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"規制情報"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"規制ラベル"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全と規制に関する情報"</string>
     <string name="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
@@ -3008,9 +3011,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"イーサネット データ使用量"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"イーサネット"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> モバイルデータ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi データ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> イーサネット データ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> データ警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> データ警告 / <xliff:g id="ID_2">%2$s</xliff:g> データ上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"請求期間"</string>
@@ -3024,6 +3030,7 @@
     <string name="data_limit" msgid="1885406964934590552">"データ上限"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> 使用(<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"データ使用量に含まれている他のアプリ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">データセーバーが ON のときのデータ無制限使用を <xliff:g id="COUNT">%1$d</xliff:g> 個のアプリに許可しました</item>
       <item quantity="one">データセーバーが ON のときのデータ無制限使用を 1 個のアプリに許可しました</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 1643cf6..f5abd8a 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"აუდიო"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ქეშირებული მონაცემები"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"სხვა"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"სისტემა"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>-ის მიმოხილვა"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"სხვა მოიცავს აპების მიერ შენახულ გაზიარებულ ფაილებს, ინტერნეტიდან ან Bluetooth-ის მეშვეობით ჩამოტვირთულ ფაილებს, Android ფაილებს და ა.შ. \n\n<xliff:g id="NAME">^1</xliff:g>-ის მთლიანი კონტენტის სანახავად, შეეხეთ მიმოხილვას."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"სისტემა მოიცავს ფაილებს, რომლებიც Android ოპერაციული სისტემის შიგნით გამოიყენება. \n\nამ ფაილების ცალ-ცალკე ნახვა ვერ მოხერხდება."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>-მა შეიძლება შეინახა ფოტოები, მუსიკა, ფილმები, აპები და სხვა მონაცემები, რომლებიც იკავებს მეხსიერების <xliff:g id="SIZE">^2</xliff:g>-ს. \n\nდეტალების სანახავად გადართეთ <xliff:g id="USER_1">^1</xliff:g>-ზე."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"დააყენეთ თქვენი <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"პორტატულ საცავად გამოყენება"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"იურიდიული ინფორმაცია"</string>
     <string name="contributors_title" msgid="5917703088825286504">"მონაწილეები"</string>
     <string name="manual" msgid="3025943393642974445">"სახელმძღვანელო"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ნორმატიული ინფორმაცია"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ნორმატიული ლეიბლები"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"უსაფრთხოება და ნორმატიული ინფორმაცია"</string>
     <string name="copyright_title" msgid="865906688917260647">"საავტორო უფლებები"</string>
     <string name="license_title" msgid="1990487604356037871">"ლიცენზია"</string>
     <string name="terms_title" msgid="7697580845616764642">"წესები და პირობები"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet მონაცემთა მოხმარება"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"მობილური ინტერნეტი: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi მონაცემები"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet მონაცემები: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"გაფრთხილება, როცა გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"გაფრთხილება, როცა გამოყენებულია: <xliff:g id="ID_1">%1$s</xliff:g>/მონაცემთა ლიმიტი: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ბილინგის ციკლი"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"მონაცემთა ლიმიტი"</string>
     <string name="data_usage_template" msgid="392191945602400904">"გამოყენებულია: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1029654422228677273">"კონფიგურაცია"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"მოხმარების გამოთვლისას გათვალისწინებული სხვა აპები"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> აპს მონაცემთა შეუზღუდავად გამოყენების უფლება აქვს, როცა მონაცემთა დამზოგველი ჩართულია</item>
       <item quantity="one">1 აპს მონაცემთა შეუზღუდავად გამოყენების უფლება აქვს, როცა მონაცემთა დამზოგველი ჩართულია</item>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f433037..a3d3871 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -835,7 +835,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wi-Fi қоңырау шалу қосулы кезде қалауыңызға және қайсы сигнал күштілігіне байланысты телефоныңыз қоңырауларды Wi-Fi желілері не жабдықтаушы желісі арқылы бағыттауы мүмкін. Бұл мүмкіндікті қосудан бұрын жабдықтаушыңыздың қатысты алымдары мен басқа мәліметтерді тексеріңіз."</string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"Төтенше мекенжайды жаңарту"</string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Төтенше жағдайда пайдаланылатын мекенжайды жаңарту"</string>
     <string name="home_settings" msgid="212375129455718176">"Негізгі"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Aудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кэштелген деректер"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Басқа"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Жүйе"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ашу"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Басқалары қолданбалар сақтаған бөлісілген файлдарды, интернет немесе Bluetooth арқылы жүктелген файлдарды, Android файлдарын және т.б. қамтиды. \n\nОсы <xliff:g id="NAME">^1</xliff:g> ішіндегі бүкіл мазмұнды көру үшін \"Ашу\" түймесін түртіңіз."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Жүйе Android операциялық жүйесінің ішінде пайдаланылатын файлдарды қамтиды. \n\nФайлдарды жеке көру мүмкін емес."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ішінде сақталған фотосуреттер, музыка, фильмдер, қолданбалар немесе жадтың <xliff:g id="SIZE">^2</xliff:g> көлемін алып тұрған басқа деректер болуы мүмкін. \n\nМәліметтерін көру үшін, <xliff:g id="USER_1">^1</xliff:g> пайдаланушысына ауысыңыз."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> орнату"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативті жад ретінде пайдалану"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Заңнамалық ақпараттар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Үлес қосушылар"</string>
     <string name="manual" msgid="3025943393642974445">"Қолмен"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Нұсқаулықтар ақпараты"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Нормативтік белгілер"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Қауіпсіздік және нормативтік ақпарат"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторлық құқықтар"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттары"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet деректерін пайдалану"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> ұялы деректер"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi деректері"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet деректері"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Деректер туралы ескерту"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Деректер туралы ескерту / <xliff:g id="ID_2">%2$s</xliff:g> Деректер шегі"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Есепшот ұсыну мерзімі"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Деректер шегі"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> арасында пайдаланылған"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурациялау"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Басқа қолданбалар трафикке қосылды"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Трафикті үнемдеу функциясы қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
       <item quantity="one">Трафикті үнемдеу функциясы қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index edb4aa5..db1716e 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"សំឡេង"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ទិន្នន័យក្នុងឃ្លាំងសម្ងាត់"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ផ្សេងៗ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ប្រព័ន្ធ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"រុករក <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ឯកសារផ្សេងៗរាប់បញ្ចូលទាំងឯកសារដែលបានចែករំលែកដោយកម្មវិធី ឯកសារដែលបានដោនឡូតពីអ៊ីនធឺណិត ឬប៊្លូធូស និងឯកសារ Android ជាដើម។ \n\nដើម្បីមើលមាតិកាទាំងស្រុងរបស់ <xliff:g id="NAME">^1</xliff:g> សូមប៉ះរុករក។"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ប្រព័ន្ធរាប់បញ្ចូលទាំងឯកសារដែលបានប្រើផ្ទៃខាងក្នុងដោយប្រព័ន្ធប្រតិបត្តិការ Android។ \n\nឯកសារទាំងនេះមិនអាចមើលមួយៗបានទេ។"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ប្រហែលជាបានរក្សារូបភាព តន្ត្រី ភាពយន្ត កម្មវិធី ឬទិន្នន័យផ្សេងទៀតដែលមានទំហំ <xliff:g id="SIZE">^2</xliff:g> នៃឧបករណ៍ផ្ទុក។ \n\nដើម្បីមើលព័ត៌មានលម្អិត សូមប្តូរទៅ <xliff:g id="USER_1">^1</xliff:g>។"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ដំឡើង <xliff:g id="NAME">^1</xliff:g> របស់អ្នក"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ប្រើជាឧបករណ៍ផ្ទុកចល័ត"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
     <string name="contributors_title" msgid="5917703088825286504">"អ្នក​ចូលរួម"</string>
     <string name="manual" msgid="3025943393642974445">"ឯកសារណែនាំ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ព័ត៌មាន​គ្រប់គ្រង"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ស្លាកបទបញ្ជា"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ព័ត៌មានសុវត្ថិភាព និងបទបញ្ជា"</string>
     <string name="copyright_title" msgid="865906688917260647">"រក្សាសិទ្ធិ"</string>
     <string name="license_title" msgid="1990487604356037871">"អាជ្ញាប័ណ្ណ"</string>
     <string name="terms_title" msgid="7697580845616764642">"លក្ខខណ្ឌ​ប្រើប្រាស់"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ការប្រើប្រាស់ទិន្នន័យអ៊ីសឺរណិត"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"អ៊ីសឺរណិត"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"ទិន្នន័យប្រព័ន្ធទូរស័ព្ទ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> នៃទិន្នន័យ Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"ទិន្នន័យអ៊ីសឺរណិត <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"ការព្រមានពីការប្រើទិន្នន័យ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"ការព្រមានពីការប្រើទិន្នន័យ <xliff:g id="ID_1">%1$s</xliff:g> / ដែនកំណត់ទិន្នន័យ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"វដ្តចេញវិក្កយបត្រ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ដែនកំណត់ទិន្នន័យ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> បានប្រើនៅចន្លោះ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"កំណត់រចនាសម្ព័ន្ធ"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"កម្មវិធីផ្សេងទៀតដែលរួមបញ្ចូលទៅក្នុងការប្រើប្រាស់"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">អនុញ្ញាតឲ្យកម្មវិធី <xliff:g id="COUNT">%1$d</xliff:g> ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
       <item quantity="one">អនុញ្ញាតឲ្យកម្មវិធី 1 ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 143e2f9..728605c 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ಆಡಿಯೊ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ಇತರೆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟನ್ನು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\nಈ <xliff:g id="NAME">^1</xliff:g> ನ ಸಂಪೂರ್ಣ ವಿಷಯಗಳನ್ನು ನೋಡಲು, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android ಆಪರೇಟಿಂಗ್ ಸಿಸ್ಟಂ ಮೂಲಕ ಆಂತರಿಕವಾಗಿ ಬಳಸಲಾದ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ. \n\nಈ ಫೈಲ್‌ಗಳನ್ನು ಪ್ರತ್ಯೇಕವಾಗಿ ವೀಕ್ಷಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ <xliff:g id="SIZE">^2</xliff:g> ರ ಸಂಗ್ರಹಣೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತಿರುವ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು, <xliff:g id="USER_1">^1</xliff:g> ಗೆ ಬದಲಾಯಿಸಿ."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ಪೋರ್ಟಬಲ್ ಸಂಗ್ರಹಣೆಯಂತೆ ಬಳಸಿ"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ಕೊಡುಗೆದಾರರು"</string>
     <string name="manual" msgid="3025943393642974445">"ಹಸ್ತಚಾಲಿತ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ನಿಯಂತ್ರಣ ಮಾಹಿತಿ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ನಿಯಂತ್ರಣ ಲೇಬಲ್‌ಗಳು"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ಸುರಕ್ಷತೆ ಮತ್ತು ನಿಯಂತ್ರಣ ಮಾಹಿತಿ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ಹಕ್ಕುಸ್ವಾಮ್ಯ"</string>
     <string name="license_title" msgid="1990487604356037871">"ಪರವಾನಗಿ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ನಿಯಮಗಳು ಮತ್ತು ಷರತ್ತುಗಳು"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ಇಥರ್ನೆಟ್ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="wifi" msgid="1081550856200013637">"ವೈ-ಫೈ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ಇಥರ್ನೆಟ್"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> ವೈ-ಫೈ ಡೇಟಾ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ಇಥರ್ನೆಟ್ ಡೇಟಾ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ಡೇಟಾ ಎಚ್ಚರಿಕೆ / <xliff:g id="ID_2">%2$s</xliff:g> ಡೇಟಾ ಮಿತಿ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ಬಿಲ್ಲಿಂಗ್ ಸೈಕಲ್‌‌"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ಡೇಟಾ ಮಿತಿ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g>ಯಷ್ಟನ್ನು <xliff:g id="ID_2">%2$s</xliff:g> ನಡುವೆ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="configure" msgid="1029654422228677273">"ಕಾನ್ಫಿಗರ್ ಮಾಡು"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಕೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">ಡೇಟಾ ಉಳಿಸುವಿಕೆಯು ಆನ್ ಆಗಿರುವಾಗ ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಬಳಸಲು <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸಲಾಗಿದೆ</item>
       <item quantity="other">ಡೇಟಾ ಉಳಿಸುವಿಕೆಯು ಆನ್ ಆಗಿರುವಾಗ ಅನಿರ್ಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಬಳಸಲು <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸಲಾಗಿದೆ</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 57d320d..ef2ef30 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"오디오"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"캐시된 데이터"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"기타"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"시스템"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> 탐색"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"앱에서 저장한 공유 파일, 인터넷으로 또는 블루투스로 다운로드한 파일, Android 파일 등이 기타에 포함됩니다. \n\n이 <xliff:g id="NAME">^1</xliff:g>의 전체 콘텐츠를 보려면 탐색을 탭하세요."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android 운영체제에 의해 내부적으로 사용된 파일이 시스템에 포함되어 있습니다. \n\n이 파일을 개별적으로 볼 수 없습니다."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>님이 <xliff:g id="SIZE">^2</xliff:g>의 저장용량을 차지하는 사진, 음악, 영화, 앱 또는 기타 데이터를 저장했을 수 있습니다. \n\n자세한 내용을 확인하려면 <xliff:g id="USER_1">^1</xliff:g>님으로 전환하세요."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> 설정"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"휴대용 저장소로 사용"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"법률정보"</string>
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
     <string name="manual" msgid="3025943393642974445">"수동"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"규정 정보"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"규정 라벨"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"안전 및 규제 정보"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
     <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"이더넷 데이터 사용량"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"이더넷"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> 모바일 데이터"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi 데이터"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> 이더넷 데이터"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 데이터 경고"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 데이터 경고 / <xliff:g id="ID_2">%2$s</xliff:g> 데이터 한도"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"결제 주기"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"데이터 한도"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>에 <xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
     <string name="configure" msgid="1029654422228677273">"설정"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"사용량이 집계된 기타 앱"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">데이터 절약 모드가 켜져 있을 때 <xliff:g id="COUNT">%1$d</xliff:g>개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
       <item quantity="one">데이터 절약 모드가 켜져 있을 때 1개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 68b90a8..09a59a9 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -1093,8 +1093,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кэштелген дайындар"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Башка"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Тутум"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> дегенди изилдөө"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Колдонмолордо сакталган жалпыга ачык документтер, Интернеттен же Bluetooth\'дан жүктөлүп алынган файлдар, Android файлдары жана башкалар. \n\nБул түзмөктүн <xliff:g id="NAME">^1</xliff:g> мазмунун толугу менен көрүү үчүн, Изилдөөнү таптап коюңуз."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Тутумда Android иш тутумунда колдонулуучу файлдар камтылган. \n\nАл файлдарды өз-өзүнчө көрүү мүмкүн эмес."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> сактагычта жалпы көлөмү <xliff:g id="SIZE">^2</xliff:g> болгон сүрөттөрдү, музыканы, тасмаларды, колдонмолорду же башка дайындарды сактап койгон окшойт. \n\nЧоо-жайын көрүү үчүн колдонуучунун каттоо эсебине кириңиз <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> түзмөгүңүздү орнотуңуз"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ташыма эстутум катары колдонуу"</string>
@@ -1285,7 +1287,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Юридикалык маалыматтар"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Салым кошуучулар"</string>
     <string name="manual" msgid="3025943393642974445">"Нускама"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Башкаруучу маалыматтар"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Башкаруучу энбелгилер"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Коопсуздук жана башкаруу тууралуу маалымат"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автордук укук"</string>
     <string name="license_title" msgid="1990487604356037871">"Уруксаттама"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттар жана жоболор"</string>
@@ -3003,9 +3006,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet дайындарынын колдонулушу"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi‑Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> уюлдук дайындар"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi дайындары"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet дайындары"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Дайындар өткөрүлүп жатканда эскертүү: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Дайындар өткөрүлүп жатканда эскертүү: <xliff:g id="ID_1">%1$s</xliff:g> / Дайындардын өткөрүлүшүн чектөө: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Эсептерди коюу мерчими"</string>
@@ -3019,6 +3025,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Дайындарды чектөө"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурациялоо"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Трафикти колдонуучу башка колдонмолор"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Дайындарды үнөмдөгүч күйүп турганда <xliff:g id="COUNT">%1$d</xliff:g> колдонмо дайындарды чектөөсүз өткөрө алат</item>
       <item quantity="one">Дайындарды үнөмдөгүч күйүп турганда 1 колдонмо дайындарды чектөөсүз өткөрө алат</item>
@@ -3156,5 +3163,5 @@
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Нускама"</string>
     <string name="deletion_helper_preference_title" msgid="7719699175312011449">"Азыр орун бошотуу"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Сактагычты көзөмөлдөгүч"</string>
-    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"Эстутумду автоматтык түрдө башкаруу"</string>
+    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"Сактагычты автоматтык түрдө башкаруу"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 8a0c177..df6b98c 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ສຽງ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ຂໍ້ມູນທີ່ເກັບໄວ້"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ອື່ນໆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ລະບົບ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"ສຳຫຼວດ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ສິ່ງອື່ນຮວມມີໄຟລ໌ທີ່ໃຊ້ຮ່ວມກັນທີ່ບັນທຶກໄວ້ໂດຍແອັບ, ໄຟລ໌ທີ່ດາວໂຫຼດຈາກອິນເຕີເນັດ ຫຼື Bluetooth, ໄຟລ໌ Android, ແລະ ອື່ນໆ. \n\nເພື່ອເບິ່ງເນື້ອຫາທັງໝົດຂອງ <xliff:g id="NAME">^1</xliff:g> ນີ້, ໃຫ້ແຕະ ສຳຫຼວດ."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ລະບົບຮວມມີໄຟລ໌ທີ່ຖືກໃຊ້ພາຍໃນໂດຍລະບົບປະຕິບັດການ Android. \n\nໄຟລ໌ເຫຼົ່ານີ້ບໍ່ສາມາດເບິ່ງແຍກກັນໄດ້."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ອາດຈະມີຮູບຖ່າຍ, ເພງ, ຮູບເງົາ,​ ແອັບ ຫຼືຂໍ້ມູນອື່ນທີ່ບັນທຶກໄວ້ທີ່ກຳລັງໃຊ້ເນື້ອທີ່ <xliff:g id="SIZE">^2</xliff:g> ຂອງບ່ອນເກັບຂໍ້ມູນ. \n\nເພື່ອເບິ່ງລາຍລະອຽດ, ໃຫ້ປ່ຽນເປັນ <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ຕັ້ງ <xliff:g id="NAME">^1</xliff:g> ຂອງ​ທ່ານ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ໃຊ້​ເປັນບ່ອນ​ຈັດ​ເກັບຂໍ້ມູນແບບພົກພາ"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ຂໍ້ມູນທາງກົດໝາຍ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ຜູ່ມີສ່ວນຮ່ວມ"</string>
     <string name="manual" msgid="3025943393642974445">"ຄູ່​ມື"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ຂໍ້ມູນກົດລະບຽບ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ສະຫລາກລະບຸການຄວບຄຸມ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ຂໍ້ມູນຄວາມປອດໄພ ແລະ ການຄວບຄຸມ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ສະຫງວນລິຂະສິດ"</string>
     <string name="license_title" msgid="1990487604356037871">"ລິຂະສິດ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ການໃຊ້ຂໍ້ມູນອີເທີເນັດ"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi​-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ອີເທີເນັດ"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> ຂໍ້ມູນເຄືອຂ່າຍມືຖື"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> ຂໍ້ມູນ Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"ຂໍ້ມູນອີເທີເນັດ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"ຄຳເຕືອນຂໍ້ມູນ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"ຄຳເຕືອນຂໍ້ມູນ <xliff:g id="ID_1">%1$s</xliff:g> / ຂີດຈຳກັດຂໍ້ມູນ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ຮອບການຮຽກເກັບເງິນ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ຂີດຈຳກັດຂໍ້ມູນ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g> ໃນລະຫວ່າງ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"ກຳນົດຄ່າ"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ແອັບອື່ນໆແມ່ນຮວມໃນການນຳໃຊ້"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">ອະນຸຍາດໃຫ້ <xliff:g id="COUNT">%1$d</xliff:g> ແອັບໄດ້ຮັບອະນຸຍາດໃຫ້ໃຊ້ຂໍ້ມູນບໍ່ຈຳກັດ ເມື່ອຕົວປະຢັດຂໍ້ມູນເປີດຢູ່</item>
       <item quantity="one">ອະນຸຍາດໃຫ້ 1 ແອັບໄດ້ຮັບອະນຸຍາດໃຫ້ໃຊ້ຂໍ້ມູນແບບບໍ່ຈຳກັດ ເມື່ອຕົວປະຢັດຂໍ້ມູນເປີດຢູ່</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a0eabc4..54acff1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Garso failai"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Talpykloje saugomi duomenys"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Kiti"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Naršyti <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Skiltyje „Kiti“ rodomi programų išsaugoti bendrinami failai, iš interneto arba naudojant „Bluetooth“ atsiųsti failai, „Android“ failai ir t. t.\n\nKad būtų rodomas visas šios saugyklos („<xliff:g id="NAME">^1</xliff:g>“) turinys, palieskite „Naršyti“."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistema įtraukia failus, kurie naudojami „Android“ operacinėje sistemoje. \n\nŠių failų negalima peržiūrėti atskirai."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> galėjo išsaugoti nuotraukų, muzikos, filmų, programų ir kitų duomenų, kurie užima <xliff:g id="SIZE">^2</xliff:g> saugyklos vietos. \n\nKad galėtumėte peržiūrėti išsamią informaciją, perjunkite į <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nustatykite <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Naudoti kaip perkeliamą atmintį"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Pagalbininkai"</string>
     <string name="manual" msgid="3025943393642974445">"Neautomatiškai"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Reguliuojam. informacija"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Įstat. numatytos etiketės"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Saugos ir teisinė informacija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
@@ -3068,9 +3071,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Eterneto duomenų naudojimas"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Eternetas"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobiliojo ryšio duomenų"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> „Wi-Fi“ duomenų"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> eterneto duomenų"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> duomenų įspėjimas"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> duomenų įspėjimas / <xliff:g id="ID_2">%2$s</xliff:g> duomenų apribojimas"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Atsiskaitymo ciklas"</string>
@@ -3084,6 +3090,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Duomenų apribojimas"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigūruoti"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Kitos įtrauktos naudojamos programos"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> programa leido naudoti neribotus duomenis, kai Duomenų taupymo priemonė įjungta</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> programos leido naudoti neribotus duomenis, kai Duomenų taupymo priemonė įjungta</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fe894f6..96b9b80 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1104,8 +1104,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Skaņa"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kešatmiņā ievietotie dati"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Citi"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistēma"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Pārlūkot: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Citi faili ir lietotnēs saglabāti kopīgoti faili, no interneta vai Bluetooth savienojumā lejupielādēti faili, Android faili un citi. \n\nLai skatītu visu saturu šajā ierīcē (<xliff:g id="NAME">^1</xliff:g>), pieskarieties vienumam Pārlūkot."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistēmā ir iekļauti faili, kas operētājsistēmā Android tiek iekšēji izmantoti. \n\nŠos failus nevar apskatīt atsevišķi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Lietotājs <xliff:g id="USER_0">^1</xliff:g>, iespējams, ir saglabājis fotoattēlus, mūziku, filmas, lietotnes vai citus datus, kas aizņem <xliff:g id="SIZE">^2</xliff:g> lielu vietu atmiņā. \n\nLai skatītu detalizētu informāciju, pārslēdzieties uz lietotāju <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Iestatiet <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Izmantot kā pārnēsājamu krātuvi"</string>
@@ -1296,7 +1298,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridiskā informācija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Līdzdalībnieki"</string>
     <string name="manual" msgid="3025943393642974445">"Rokasgrāmata"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulējoša informācija"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Norādījumu uzlīmes"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Drošības un regulējošā informācija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
@@ -3035,9 +3038,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet datu lietojums"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Tīkls Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobilie dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi dati"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Datu brīdinājums: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datu brīdinājums: <xliff:g id="ID_1">%1$s</xliff:g>/ datu ierobežojums: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Norēķinu cikls"</string>
@@ -3051,6 +3057,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datu ierobežojums"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti šādā laika periodā: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurēt"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Citas lietojuma datos iekļautās lietotnes"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="zero">Esot ieslēgtam datu lietojuma samazinātājam, neierobežotus datus ir atļauts izmantot <xliff:g id="COUNT">%1$d</xliff:g> lietotnēs.</item>
       <item quantity="one">Esot ieslēgtam datu lietojuma samazinātājam, neierobežotus datus ir atļauts izmantot <xliff:g id="COUNT">%1$d</xliff:g> lietotnē.</item>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 1cd0d02..f3f9a44 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани податоци"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Друго"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Делот Друго опфаќа споделени датотеки што ги зачувале апликациите, датотеки преземени од интернет или Bluetooth, датотеки на Android итн. \n\nЗа да ја видите целокупната содржина на <xliff:g id="NAME">^1</xliff:g>, допрете Истражи."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Системот вклучува датотеки што интерно ги користи оперативниот систем Android. \n\nТие датотеки не може да се прегледуваат индивидуално."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> може да има зачувани фотографии, музика, филмови, апликации или други податоци што зафаќаат <xliff:g id="SIZE">^2</xliff:g> меморија. \n\nЗа детали, префрлете се на <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Поставете <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи како пренослива меморија"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Соработници"</string>
     <string name="manual" msgid="3025943393642974445">"Упатство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулаторни информации"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулаторни етикети"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безбедност и регулаторни информации"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Потрошен етернет сообраќај"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Етернет"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> мобилни податоци"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> податоци преку Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> етернет податоци"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Предупредување за податоците"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Предупредување за податоците/<xliff:g id="ID_2">%2$s</xliff:g> Ограничување на податоците"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Циклус за наплата"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ограничување податоци"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> потрошено помеѓу <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигурирај"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Други апликации вклучени во употребата"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозвола да користи неограничен интернет кога е вклучен Штедачот на интернет</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апликации имаат дозвола да користат неограничен интернет кога е вклучен Штедачот на интернет</item>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index aec31e8..bd84f6a 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ഓഡിയോ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"കാഷെ ചെയ്‌ത ഡാറ്റ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"മറ്റുള്ളവ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"സിസ്‌റ്റം"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> അടുത്തറിയുക"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"മറ്റുള്ളവയിൽ, ആപ്‌സ് വഴി സംരക്ഷിച്ച പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും മറ്റും ഉൾപ്പെടുന്നു. \n\nഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, അടുത്തറിയുക ടാപ്പുചെയ്യുക."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Android ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ആന്തരികമായി ഉപയോഗിച്ച ഫയലുകൾ സിസ്റ്റത്തിൽ ഉൾപ്പെടുന്നു. \n\nഈ ഫയലുകൾ വെവ്വേറെയായി കാണാൻ കഴിയുകയില്ല."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"സംഭരണത്തിന്റെ <xliff:g id="SIZE">^2</xliff:g> വരെ ഇടം എടുക്കുന്ന ഫോട്ടോകൾ, സംഗീതം, സിനിമകൾ, ആപ്സ്, മറ്റ് ഡാറ്റ തുടങ്ങിയവ <xliff:g id="USER_0">^1</xliff:g> സംരക്ഷിച്ചിട്ടുണ്ടാകാം. \n\nവിശദാംശങ്ങൾ കാണുന്നതിന്, <xliff:g id="USER_1">^1</xliff:g> എന്നതിലേക്ക് മാറുക."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"നിങ്ങളുടെ <xliff:g id="NAME">^1</xliff:g> സജ്ജമാക്കുക"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"പോർട്ടബിൾ സംഭരണമായി ഉപയോഗിക്കുക"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"നിയമപരമായ വിവരം"</string>
     <string name="contributors_title" msgid="5917703088825286504">"സംഭാവകർ"</string>
     <string name="manual" msgid="3025943393642974445">"മാനുവൽ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"റെഗുലേറ്ററി വിവരം"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"റെഗുലേറ്ററി ലേബലുകൾ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"സുരക്ഷാ - റെഗുലേറ്ററി വിവരങ്ങൾ"</string>
     <string name="copyright_title" msgid="865906688917260647">"പകർപ്പവകാശം"</string>
     <string name="license_title" msgid="1990487604356037871">"ലൈസന്‍സ്"</string>
     <string name="terms_title" msgid="7697580845616764642">"നിബന്ധനകളും വ്യവസ്ഥകളും"</string>
@@ -2269,12 +2272,12 @@
       <item quantity="one">സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="7392268444365783975">
-      <item quantity="other">നിങ്ങളുടെ ഉപകരണത്തിൽ, <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ഡൊമെയ്ൻ സർട്ടിഫിക്കറ്റ് അതോറിറ്റികൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി നിരീക്ഷിക്കുന്നതിന് ഇത് ഡൊമെയ്‌നിനെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റുകളെ പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റുകളെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
-      <item quantity="one">നിങ്ങളുടെ ഉപകരണത്തിൽ, <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ഡൊമെയ്ൻ ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി നിരീക്ഷിക്കുന്നതിന് ഇത് ഡൊമെയ്‌നിനെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
+      <item quantity="other">നിങ്ങളുടെ ഉപകരണത്തിൽ, <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ഡൊമെയ്ൻ സർട്ടിഫിക്കറ്റ് അതോറിറ്റികൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കുന്നതിന് ഇത് ഡൊമെയ്‌നിനെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റുകളെ പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റുകളെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
+      <item quantity="one">നിങ്ങളുടെ ഉപകരണത്തിൽ, <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ഡൊമെയ്ൻ ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ആക്റ്റിവിറ്റി നിരീക്ഷിക്കുന്നതിന് ഇത് ഡൊമെയ്‌നിനെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="9003188435098053227">
-      <item quantity="other">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> സർട്ടിഫിക്കറ്റ് അതോറിറ്റികൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റുകളെ പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റുകളെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
-      <item quantity="one">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്ടിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
+      <item quantity="other">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> സർട്ടിഫിക്കറ്റ് അതോറിറ്റികൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്റ്റിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റുകളെ പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റുകളെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
+      <item quantity="one">നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലിനായി <xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> ഒരു സർട്ടിഫിക്കറ്റ് അതോറിറ്റി ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ട്, ഇമെയിലുകളും ആപ്‌സും സുരക്ഷിത വെബ്‌സൈറ്റുകളും ഉൾപ്പെടെ, ഔദ്യോഗിക നെറ്റ്‌വർക്ക് ആക്റ്റിവിറ്റി മോണിറ്റർ ചെയ്യുന്നതിന് ഇത് അവരെ അനുവദിച്ചേക്കാം. നിങ്ങൾക്ക് ഈ സർട്ടിഫിക്കറ്റ് പരിചിതമാക്കാനോ നീക്കംചെയ്യാനോ തീരുമാനിക്കാവുന്നതാണ്.\n\nഈ സർട്ടിഫിക്കറ്റിനെ കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ അഡ്മിനുമായി ബന്ധപ്പെടുക.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ഇമെയിലുകളും അപ്ലിക്കേഷനുകളും വെബ്‌സൈറ്റുകൾ സുരക്ഷിതമാക്കലും ഉൾപ്പെടെയുള്ള നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പ്രവർത്തനങ്ങൾ നിരീക്ഷിക്കാൻ ഒരു മൂന്നാം കക്ഷിയ്‌ക്ക് കഴിയും.\n\nനിങ്ങളുടെ ഉപകരണത്തിൽ വിശ്വാസ്യയോഗ്യമായ ഒരു ക്രെഡൻഷ്യൽ ഇൻസ്റ്റാളുചെയ്യുന്നത് ഇത് സാധ്യമാക്കുന്നു."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ഇതർനെറ്റ് ഡാറ്റാ ഉപയോഗം"</string>
     <string name="wifi" msgid="1081550856200013637">"വൈഫൈ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ഇതർനെറ്റ്"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> സെല്ലുലാർ ഡാറ്റ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> വൈഫൈ ഡാറ്റ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ഇതർനെറ്റ് ഡാറ്റ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ഡാറ്റാ മുന്നറിയിപ്പ് / <xliff:g id="ID_2">%2$s</xliff:g> ഡാറ്റാ പരിധി"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ബില്ലിംഗ് സൈക്കിൾ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ഡാറ്റാ പരിധി"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> എന്നീ തീയതികൾക്ക് ഇടയിൽ <xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="configure" msgid="1029654422228677273">"കോൺഫിഗർ ചെയ്യുക"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ഉപയോഗത്തിൽ ഉൾപ്പെട്ട മറ്റ് ആപ്‌സ്"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിമിതിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് <xliff:g id="COUNT">%1$d</xliff:g> ആപ്‌സിനെ അനുവദിച്ചു</item>
       <item quantity="one">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിമിതിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് ഒരു ആപ്പിനെ അനുവദിച്ചു</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 0c47558..c566937 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1084,8 +1084,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Нууцаар нөөцөлсөн өгөгдөл"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Бусад"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>-г судлах"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Бусад файлд апп-ын хадгалсан файл болон Интернэт, Bluetooth, Android-с татсан файл зэрэг багтдаг. \n\nЭнэ <xliff:g id="NAME">^1</xliff:g>-н бүх агуулгыг харахын тулд Судлах хэсгийг дарна уу."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Систем нь Андройд үйлдлийн системийн дотооддоо хэрэглэдэг файлыг агуулдаг. \n\nЭдгээр файлыг тус бүрээр нь харах боломжгүй."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> нь нийт багтаамжийн <xliff:g id="SIZE">^2</xliff:g>-г эзлэх хэмжээний зураг, дуу хөгжим, кино, апп болон бусад файлыг хадгалсан байж магадгүй. \n\nДэлгэрэнгүйг харахын тулд <xliff:g id="USER_1">^1</xliff:g> рүү шилжинэ үү."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>-аа тохируул"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Зөөврийн санах хэлбэрээр ашиглах"</string>
@@ -1276,7 +1278,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Хувь оруулагчид"</string>
     <string name="manual" msgid="3025943393642974445">"Гар ажиллагаатай"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Зохицуулалтын мэдээлэл"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Зохицуулалтын шошго"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Аюулгүй байдлын, зохицуулалтын мэдээлэл"</string>
     <string name="copyright_title" msgid="865906688917260647">"Зохиогчийн эрх"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Ерөнхий нөхцлүүд"</string>
@@ -2992,9 +2995,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Этернэт дата хэрэглээ"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Этернэт"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> үүрэн холбооны дата"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi дата"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> этернэтийн дата"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Дата хэрэглээний сануулга"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Дата хэрэглээний сануулга / <xliff:g id="ID_2">%2$s</xliff:g> Дата хязгаар"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Тооцооны мөчлөг"</string>
@@ -3008,6 +3014,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Дата хязгаар"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g>  <xliff:g id="ID_2">%2$s</xliff:g> хооронд ашигласан"</string>
     <string name="configure" msgid="1029654422228677273">"Тохируулах"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Бусад апп-г хэрэглээнд оруулсан"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апп нь өгөгдөл хамгаалагч асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
       <item quantity="one">1 апп нь өгөгдөл хамгаалагчийг асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 37e33b5..0f6271c 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"कॅश केलेला डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"इतर"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्यमध्ये अॅप्सनी जतन केलेल्या सामायिक फायली, इंटरनेट किंवा ब्लूटुथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n या <xliff:g id="NAME">^1</xliff:g> मधील संपूर्ण सामग्री पाहण्यासाठी एक्सप्लोर करा टॅप करा."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"सिस्टीममध्ये Android ऑपरेटिंग सिस्टीमने अंतर्गतरित्या वापरलेल्या फायली समाविष्‍ट असतात. \n\nया फायली वैयक्तिकरित्या पाहिल्या जाऊ शकत नाहीत."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="SIZE">^2</xliff:g> संचयन घेत असलेले फोटो, संगीत, चित्रपट, अ‍ॅप्स किंवा अन्य डेटा <xliff:g id="USER_0">^1</xliff:g> नी जतन केला असू शकतो. \n\nतपशील पाहण्‍यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल संचयन म्हणून वापरा"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कायदेशीर माहिती"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ते"</string>
     <string name="manual" msgid="3025943393642974445">"व्यक्तिचलित"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"नियामक माहिती"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक लेबले"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा आणि नियामक माहिती"</string>
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"इथरनेट डेटा वापर"</string>
     <string name="wifi" msgid="1081550856200013637">"वाय-फाय"</string>
     <string name="ethernet" msgid="6600095783781389720">"इथरनेट"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> मोबाइल डेटा"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> वाय-फाय डेटा"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> इथरनेट डेटा"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावणी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावणी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा मर्यादा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"डेटा मर्यादा"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> मध्‍ये <xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
     <string name="configure" msgid="1029654422228677273">"कॉन्फिगर करा"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"वापरामध्ये समाविष्‍ट केलेले अन्य अॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">डेटा बचतकर्ता चालू असताना <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगास अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
       <item quantity="other">डेटा बचतकर्ता चालू असताना <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगांना अनिर्बंध डेटा वापरण्याची अनुमती दिली</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 514fbc9..5126173 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Lain-lain"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Teroka <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Lain-lain termasuk fail kongsi yang disimpan oleh apl, fail yang dimuat turun daripada Internet atau Bluetooth, fail Android dan seterusnya. \n\nUntuk melihat keseluruhan kandungan <xliff:g id="NAME">^1</xliff:g> ini, ketik Teroka."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem termasuk fail yang digunakan secara dalaman oleh sistem pengendalian Android. \n\nFail ini tidak boleh dilihat satu persatu."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mungkin telah menyimpan foto, muzik, filem, apl atau data lain yang menggunakan ruang storan sebesar <xliff:g id="SIZE">^2</xliff:g>. \n\nUntuk melihat butirannya, beralih kepada <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sediakan <xliff:g id="NAME">^1</xliff:g> anda"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gunakan sebagai storan mudah bawa"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Maklumat undang-undang"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Penyumbang"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Maklumat kawal selia"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Label kawal selia"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Maklumat keselamatan &amp; kawal selia"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Penggunaan data Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> data selular"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> data Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> data ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Amaran data <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Amaran data <xliff:g id="ID_1">%1$s</xliff:g>/Had data <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Kitaran pengebilan"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Had data"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan antara <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurasikan"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Apl lain yang termasuk dalam penggunaan"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apl dibenarkan menggunakan data tanpa had apabila Penjimat Data dihidupkan</item>
       <item quantity="one">1 apl dibenarkan menggunakan data tanpa had apabila Penjimat Data dihidupkan</item>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index e561c91..4dd545f 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"အသံ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"မှတ်သိမ်းထားသော ဒေတာ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"အခြား"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"စနစ်"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> အား လေ့လာပါ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"အခြားပါဝင်မှုများမှာ အက်ပ်များမှ သိမ်းဆည်းလိုက်သည့် ဖိုင်များ၊ အင်တာနက် သို့မဟုတ် ဘလူးတုသ်မှ ဒေါင်းလုဒ်လုပ်ထားသည့် မျှဝေထားသောဖိုင်များ၊ Android ဖိုင်များ၊ စသည်တို့ဖြစ်သည်။ \n\n<xliff:g id="NAME">^1</xliff:g>၏ အကြောင်းအရာများ တစ်ခုလုံးကိုကြည့်ရန်၊ လေ့လာပါ ကိုတို့ပါ။"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"စနစ်တွင် Android လည်ပတ်မှုစနစ်အတွင်း အသုံးပြုသည့် ဖိုင်များ ပါဝင်ပါသည်။ \n\nဤဖိုင်များကို တစ်ခုချင်းစီဖွင့်ကြည့်၍ မရပါ။"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> သည် ဓာတ်ပုံများ၊ ဂီတ၊ ရုပ်ရှင်များ၊ အက်ပ် များနှင့် အခြားဒေတာများအား သိုလှောင်မှု၏ <xliff:g id="SIZE">^2</xliff:g>  အထိ နေရာယူနိုင်သည်။ \n\n အသေးစိတ်အား ကြည့်ရန်၊ သို့ ပြောင်းပါ။ <xliff:g id="USER_1">^1</xliff:g>"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"သင့် <xliff:g id="NAME">^1</xliff:g> ကိုတပ်ဆင်မည်"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ရွှေ့လျားနိုင်သည့် သိုလှောင်မှုအဖြစ် သုံးမည်"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ထောက်ပံ့သူများ"</string>
     <string name="manual" msgid="3025943393642974445">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"စံစည်းမျဉ်း လိုက်နာမှု"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"စည်းမျဉ်း အညွှန်းများ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"လုံခြုံရေးနှင့် စည်းမျဉ်းအချက်အလက်များ"</string>
     <string name="copyright_title" msgid="865906688917260647">"မူပိုင်ခွင့်"</string>
     <string name="license_title" msgid="1990487604356037871">"လိုင်စင်"</string>
     <string name="terms_title" msgid="7697580845616764642">"သတ်မှတ်ချက်များနှင့် အခြေအနေများ"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"အီတာနက်ဒေတာအသုံးပြုချက်"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"အီတာနက်"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> ဆဲလ်လူလာဒေတာ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> ဝိုင်ဖိုင်ဒေတာ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> အီတာနက်ဒေတာ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက်"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက် / <xliff:g id="ID_2">%2$s</xliff:g> ဒေတာကန့်သတ်ချက်"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ငွေတောင်းခ့မှု ကြားကာလ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ဒေတာအကန့်အသတ်"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> အကြားအသုံးပြုခဲ့သည်"</string>
     <string name="configure" msgid="1029654422228677273">"ပြင်ဆင်သတ်မှတ်ရန်"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"အသုံးပြုမှုတွင် ပါဝင်သည့် အခြားအက်ပ်များ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">ဒေတာချွေတာမှုဖွင့်ထားချိန်တွင် ကန့်သတ်မှုမရှိသည့်ဒေတာအသုံးပြုရန် အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုကိုခွင့်ပြုထားသည်</item>
       <item quantity="one">ဒေတာချွေတာမှုဖွင့်ထားချိန်တွင် ကန့်သတ်မှုမရှိသည့်ဒေတာကို အသုံးပြုရန် အက်ပ် ၁ ခုကိုခွင့်ပြုထားသည်</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fa643cd..ea43b75 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Lyd"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Bufrede data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Annet"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Andre filer inkluderer delte filer som er lagret av apper, filer lastet ned fra Internett eller via Bluetooth, Android-filer og så videre. \n\nFor å se en fullstendig oversikt over innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systemet inkluderer filer som brukes internt av Android-operativsystemet. \n\nDisse filene kan ikke sees hver for seg."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, filmer, apper eller andre data som tar opp <xliff:g id="SIZE">^2</xliff:g> av lagringsplassen. \n\nHvis du vil se detaljer, bytt til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medvirkende"</string>
     <string name="manual" msgid="3025943393642974445">"Brukerveiledning"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Standarder/bestemmelser"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Forskriftsmessig merking"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Sikkerhetsinformasjon og forskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-databruk"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobildata: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi-data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet-data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Advarsel for databruk: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advarsel for databruk: <xliff:g id="ID_1">%1$s</xliff:g> / datagrense: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringssyklus"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt i tidsrommet <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurer"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Andre apper som er inkludert i bruken"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apper kan bruke ubegrenset med data når Datasparing er på</item>
       <item quantity="one">1 app kan bruke ubegrenset med data når Datasparing er på</item>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 6d9b57e..786fe47 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"अडियो"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"क्यास गरेको डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"अन्य"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"प्रणाली"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> अन्वेषण गर्नुहोस्"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"अन्यमा साझेदारी गरिएका फाइलहरू, अनुप्रयोगहरूद्वारा साझेदारी गरिएका फाइलहरू, इन्टरनेट वा Bluetooth बाट डाउनलोड गरिएका फाइलहरू, Android फाइलहरू र धेरै समावेश छन्। \n\n यो सम्पूर्ण सामग्रीहरू हेर्न <xliff:g id="NAME">^1</xliff:g> अन्वेषणमा ट्याप गर्नुहोस्।"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"प्रणालीमा Android अपरेटिङ सिस्टमद्वारा आन्तरिक रूपमा प्रयोग गरिएका फाइलहरू समावेश छन्।\n\nयी फाइलहरूलाई एक-एक गरेर हेर्न सकिँदैन।"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ले तस्बिर, सँगीत, चलचित्र, अनुप्रयोग, वा अन्य डेटा सुरक्षित गरेको हुनसक्छ जसले <xliff:g id="SIZE">^2</xliff:g> को भण्डारण ओगटिरहेको छ।\n\nविवरणहरू हेर्न <xliff:g id="USER_1">^1</xliff:g>मा स्विच गर्नुहोस्।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"तपाईँको <xliff:g id="NAME">^1</xliff:g> सेट गर्नुहोस्"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"कानुनी जानकारी"</string>
     <string name="contributors_title" msgid="5917703088825286504">"योगदानकर्ताहरू"</string>
     <string name="manual" msgid="3025943393642974445">"म्यानुअल"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"नियमित जानकारी"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"नियामक सम्बन्धी लेबलहरू"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"सुरक्षा र नियामक सम्बन्धी जानकारी"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
     <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"इथरनेट डेटाको उपयोग"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"इथरनेट"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> सेलुलर डेटा"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi डेटा"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> इथरनेट डेटा"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिङ चक्र"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"डेटाको सीमा"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> बीचमा प्रयोग गरियो"</string>
     <string name="configure" msgid="1029654422228677273">"कन्फिगर गर्नुहोस्"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"प्रयोगमा समावेश गरिएका अन्य अनुप्रयोगहरू"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">डेटा सेभर अन हुँदा <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरूलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
       <item quantity="one">डेटा सेभर अन हुँदा १ अनुप्रयोगलाई असीमित डेटाको प्रयोग गर्न अनुमति दिइयो</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5b79d4e..9fe4e6e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Gegevens in het cachegeheugen"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Overige"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systeem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> verkennen"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Overig omvat gedeelde bestanden die zijn opgeslagen door apps, bestanden die zijn gedownload via internet of Bluetooth, Android-bestanden en meer. \n\nAls je de volledige inhoud van deze <xliff:g id="NAME">^1</xliff:g> wilt bekijken, tik je op Verkennen."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"\'Systeem\' omvat bestanden die intern worden gebruikt door het Android-besturingssysteem. \n\nDeze bestanden kunnen niet afzonderlijk worden bekeken."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan opgeslagen foto\'s, muziek, films, apps of andere gegevens bevatten die <xliff:g id="SIZE">^2</xliff:g> aan opslagruimte innemen. \n\nAls je details wilt bekijken, schakel je over naar <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Je <xliff:g id="NAME">^1</xliff:g> configureren"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruiken als draagbare opslag"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bijdragers"</string>
     <string name="manual" msgid="3025943393642974445">"Handleiding"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Wettelijke informatie"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regelgevingslabels"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Info over veiligheid en regelgeving"</string>
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-datagebruik"</string>
     <string name="wifi" msgid="1081550856200013637">"Wifi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobiele data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> wifi-data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> Ethernet-data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> datawaarschuwing"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> datawaarschuwing / <xliff:g id="ID_2">%2$s</xliff:g> datalimiet"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Betalingscyclus"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datalimiet"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configureren"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Andere apps opgenomen in gebruik"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps mogen onbeperkt data gebruiken terwijl Databesparing is ingeschakeld</item>
       <item quantity="one">1 app mag onbeperkt data gebruiken terwijl Databesparing is ingeschakeld</item>
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa-rIN/arrays.xml
index bc3cd58..b36d614 100644
--- a/res/values-pa-rIN/arrays.xml
+++ b/res/values-pa-rIN/arrays.xml
@@ -160,7 +160,7 @@
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ਵਰਤੋਂ ਸਮਾਂ"</item>
-    <item msgid="4796160515314745154">"ਆਖ਼ਰੀ ਵਾਰ ਵਰਤਿਆ"</item>
+    <item msgid="4796160515314745154">"ਆਖਰੀ ਵਾਰ ਵਰਤਿਆ"</item>
     <item msgid="2502754479975776899">"ਐਪ ਦਾ ਨਾਮ"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 6de4324..fa32ad9 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -354,12 +354,12 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ਠੀਕ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"ਮਿਟਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"ਆਓ ਸ਼ੁਰੂ ਕਰੀਏ!"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੂਚਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੰਵੇਦਕ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਕੰਪਨ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"ਬਹੁਤ ਵਧੀਆ! ਹੁਣ ਦੁਬਾਰਾ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਸਾਰੇ ਵੱਖ-ਵੱਖ ਹਿੱਸੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਥੋੜ੍ਹਾ ਜਿਹਾ ਸਰਕਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਚਿੰਨ੍ਹ ਦੇਖਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਪਛਾਣ ਲਈ ਜਾਂ ਕਿਸੇ ਖ਼ਰੀਦ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਛੋਹਵੋ।"</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਸਕਿਰਿਆ ਅਤੇ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕੇਵਲ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"ਜਦੋਂ ਤੁਸੀਂ ਇਹ ਆਈਕਨ ਦੇਖੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
@@ -374,7 +374,7 @@
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅੱਗੇ"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਐਕਸੈਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"ਸਕ੍ਰੀਨ ਲੌਕ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਹੋਰ ਜਾਣਨ ਲਈ ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ। "<annotation id="admin_details">"ਹੋਰ ਵੇਰਵੇ"</annotation>\n\n"ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਅਤੇ ਐਪ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਲਈ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"ਉਂਗਲ ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸੰਵੇਦਕ ਨੂੰ ਛੋਹਵੋ"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"ਉਂਗਲ ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਇਹ ਚਿੰਨ੍ਹ ਦੇਖਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"ਆਪਣੀ ਸੈਟਿੰਗਜ਼ ਨੂੰ ਬਦਲਣ ਲਈ, ਸੈਟਿੰਗਜ਼ ਅਤੇ ਸੁਰੱਖਿਆ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਿੱਚ ਜਾਓ"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜ ਸਕਦੇ ਹੋ"</string>
@@ -465,7 +465,7 @@
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਸ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"ਡੀਵਾਈਸ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
 </xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਸ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
@@ -542,9 +542,9 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ਰੱਦ ਕਰੋ"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"ਅੱਗੇ"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ਸੈਟਅਪ ਪੂਰਾ ਹੈ।"</string>
-    <string name="device_admin_title" msgid="3562216873644263804">"ਡੀਵਾਈਸ ਪ੍ਰਬੰਧ"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਨ"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਕ ਦੇਖੋ ਜਾਂ ਅਕਿਰਿਆਸ਼ੀਲ ਬਣਾਓ"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਦੇਖੋ ਜਾਂ ਅਕਿਰਿਆਸ਼ੀਲ ਬਣਾਓ"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ ਦੇਖੋ ਜਾਂ ਅਕਿਰਿਆਸ਼ੀਲ ਬਣਾਓ"</string>
@@ -844,12 +844,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"ਸੰਗੀਤ ਇਫੈਕਟਸ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ਰਿੰਗਰ ਵੌਲਿਊਮ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸਾਈਲੈਂਟ ਹੋਣ ਵੇਲੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"ਡਿਫੌਲਟ ਸੂਚਨਾ ਅਵਾਜ਼"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ਰਿੰਗਟੋਨ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ਸੂਚਨਾ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ਸੂਚਨਾਵਾਂ ਲਈ ਇਨਕਮਿੰਗ ਕਾਲ ਵੌਲਿਊਮ ਵਰਤੋ"</string>
     <string name="home_work_profile_not_supported" msgid="7457951997970419085">"ਕੰਮ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ਡਿਫੌਲਟ ਸੂਚਨਾ ਅਵਾਜ਼"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"ਮੀਡੀਆ"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"ਸੰਗੀਤ ਅਤੇ ਵੀਡੀਓ ਲਈ ਵੌਲਿਊਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ਅਲਾਰਮ"</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ਔਡੀਓ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ਹੋਰ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ਹੋਰਾਂ ਵਿੱਚ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਕੀਤੀਆਂ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ ਆਦਿ ਸ਼ਾਮਲ ਹਨ। \n\n<xliff:g id="NAME">^1</xliff:g> ਦੀ ਸਾਰੀ ਸਮੱਗਰੀ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ਸਿਸਟਮ ਵਿੱਚ Android ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਵੱਲੋਂ ਅੰਦਰੂਨੀ ਤੌਰ \'ਤੇ ਵਰਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ। \n\nਇਹਨਾਂ ਫ਼ਾਈਲਾਂ ਨੂੰ ਵਿਅਕਤੀਗਤ ਤੌਰ \'ਤੇ ਵੇਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ ਫੋਟੋਆਂ, ਸੰਗੀਤ, ਮੂਵੀਜ, ਐਪਸ ਜਾਂ ਹੋਰ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਲੈ ਰਿਹਾ ਹੈ। \n\n ਵੇਰਵੇ ਦੇਖਣ ਲਈ, <xliff:g id="USER_1">^1</xliff:g> ਤੇ ਸਵਿਚ ਕਰੋ।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
@@ -1233,7 +1235,7 @@
     <string name="network_settings_title" msgid="4871233236744292831">"ਸੈਲਿਊਲਰ ਨੈਟਵਰਕਸ"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"ਮੋਬਾਈਲ ਪਲਾਨ"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"SMS ਐਪ"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ਕੀ SMS ਐਪ ਬਦਲਣਾ ਹੈ?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ਕੀ SMS ਐਪ ਬਦਲਣੀ ਹੈ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ਕੀ ਆਪਣੇ SMS ਐਪ ਦੇ ਤੌਰ ਤੇ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_APP">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ਕੀ <xliff:g id="NEW_APP">%s</xliff:g> ਨੂੰ ਆਪਣੇ SMS ਐਪ ਦੇ ਤੌਰ ਤੇ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"ਕੀ Wi‑Fi ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ਸਹਿਯੋਗੀ"</string>
     <string name="manual" msgid="3025943393642974445">"ਮੈਨੁਅਲ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ਨਿਯਾਮਕ ਜਾਣਕਾਰੀ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ਰੈਗੂਲੇਟਰੀ ਲੇਬਲ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ਸੁਰੱਖਿਆ ਅਤੇ ਰੈਗੂਲੇਟਰੀ ਜਾਣਕਾਰੀ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ਕਾਪੀਰਾਈਟ"</string>
     <string name="license_title" msgid="1990487604356037871">"ਲਾਇਸੰਸ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ"</string>
@@ -1374,14 +1377,14 @@
     <string name="install_applications" msgid="4872012136210802181">"ਅਗਿਆਤ ਸਰੋਤ"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"ਸਾਰੇ ਐਪ ਸਰੋਤਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="install_unknown_applications_title" msgid="663831043139080992">"ਤੁਹਾਨੂੰ Google Play ਤੋਂ ਇਲਾਵਾ ਹੋਰਾਂ ਸਰੋਤਾਂ ਤੋਂ ਐਪਸ ਇੰਸਟੌਲ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ"</string>
-    <string name="install_unknown_applications" msgid="176855644862942064">"ਅਗਿਆਤ ਸਰੋਤਾਂ ਦੇ ਐਪਸ ਦੀ ਇੰਸਟੌਲੇਸ਼ਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡੈਟੇ ’ਤੇ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਹੋਣ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"ਤੁਹਾਡੇ ਫੋਨ ਅਤੇ ਨਿੱਜੀ ਡੈਟੇ ’ਤੇ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਫੋਨ ਨੂੰ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਹੋਣ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਲਈਆਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"ਤੁਹਾਡਾ ਫੋਨ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਲਈਆਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਫੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਸਮਰੱਥ ਬਣਾਓ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ਸਟੋਰੇਜ"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"ਡਿਫ਼ੌਲਟ ਰੂਪ ਵਿੱਚ ਖੋਲ੍ਹੋ"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਖੋਲ੍ਹੋ"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ਡਿਫੌਲਟਸ"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ਸਕ੍ਰੀਨ ਅਨੁਕੂਲਤਾ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ਅਨੁਮਤੀਆਂ"</string>
@@ -1423,7 +1426,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"ਆਪਾਤਕਾਲ ਐਪ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ਕੀ ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\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="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\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="2559089511841281242">"ਐਪਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
@@ -1636,7 +1639,7 @@
     <string name="testing_usage_stats" msgid="7823048598893937339">"ਵਰਤੋਂ ਅੰਕੜੇ"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ:"</string>
     <string name="app_name_label" msgid="5440362857006046193">"ਐਪ"</string>
-    <string name="last_time_used_label" msgid="8459441968795479307">"ਆਖ਼ਰੀ ਵਾਰ ਵਰਤਿਆ"</string>
+    <string name="last_time_used_label" msgid="8459441968795479307">"ਆਖਰੀ ਵਾਰ ਵਰਤਿਆ"</string>
     <string name="usage_time_label" msgid="295954901452833058">"ਵਰਤੋਂ ਸਮਾਂ"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"ਪਹੁੰਚਯੋਗਤਾ"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ਪਹੁੰਚਯੋਗਤਾ ਸੈਟਿੰਗਾਂ"</string>
@@ -1773,7 +1776,7 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ਬਾਕੀ"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"ਚਾਰਜ ਕਰਨ ਲਈ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="2409288197839512482">"ਆਖ਼ਰੀ ਪੂਰਾ ਚਾਰਜ ਤੋਂ ਬਾਅਗ ਵਰਤੋ"</string>
+    <string name="power_usage_list_summary" msgid="2409288197839512482">"ਆਖਰੀ ਪੂਰਾ ਚਾਰਜ ਤੋਂ ਬਾਅਗ ਵਰਤੋ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"ਬੈਟਰੀ ਤੇ <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1952,7 +1955,7 @@
     <string name="user_credentials_summary" msgid="7271228342106080167">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"ਉੱਨਤ"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ਹਾਰਡਵੇਅਰ-ਬੈਕ ਕੀਤਾ"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ਕੇਵਲ ਸੌਫਟਵੇਅਰ"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -2353,7 +2356,7 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ਟੈਪ ਅਤੇ ਭੁਗਤਾਨ ਕਰੋ"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ਸਟੋਰਾਂ ਵਿੱਚ ਆਪਣੇ ਫੋਨ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"ਭੁਗਤਾਨ ਡਿਫ਼ੌਲਟ"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"ਭੁਗਤਾਨ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ਡਿਫੌਲਟ ਵਰਤੋ"</string>
@@ -2518,13 +2521,13 @@
     <string name="ringtone_title" msgid="5379026328015343686">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
     <string name="notification_ringtone_title" msgid="3361201340352664272">"ਡਿਫੌਲਟ ਸੂਚਨਾ ਰਿੰਗਟੋਨ"</string>
     <string name="alarm_ringtone_title" msgid="2015124067611102995">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਅਲਾਰਮ ਰਿੰਗਟੋਨ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਵੀ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ਡਾਇਲ ਪੈਡ ਟੋਨਾਂ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"ਚਾਰਜ ਕਰਨ ਦੀ ਅਵਾਜ਼ਾਂ"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ਡੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"ਅਵਾਜ਼ਾਂ ਛੋਹਵੋ"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"ਅਵਾਜ਼ਾਂ ਸਪੱਰਸ਼ ਕਰੋ"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ਡੌਕ ਸਪੀਕਰ ਪਲੇ ਕਰਦਾ ਹੈ"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ ਔਡੀਓ"</string>
@@ -2685,7 +2688,7 @@
     <string name="switch_off_text" msgid="1139356348100829659">"ਬੰਦ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"ਜਦੋਂ ਇਹ ਸੈਟਿੰਗ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਤਦ ਤੱਕ ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਨੂੰ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਲਈ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ।\n\nਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ:\n\n1. ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ।\n\n2. ਉਸ ਸਕ੍ਰੀਨ ਨੂੰ ਖੋਲ੍ਹੋ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਪਿੰਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n\n3. ਰੂਪ-ਰੇਖਾ \'ਤੇ ਟੈਪ ਕਰੋ।\n\n4. ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ ਅਤੇ ਫਿਰ ਪਿੰਨ ਚਿੰਨ੍ਹ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪੈਟਰਨ ਅਨਲੌਕ ਕਰਨ ਲਈ ਪੁੱਛੋ"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਨਲੌਕ ਪੈਟਰਨ ਵਾਸਤੇ ਪੁੱਛੋ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ PIN ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡੀਵਾਈਸ ਲੌਕ ਕਰੋ"</string>
@@ -2721,7 +2724,7 @@
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ਜਾਣਕਾਰੀ"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ਸੰਬੰਧਿਤ ਜਾਣਕਾਰੀ"</string>
     <string name="slot_number" msgid="3762676044904653577">"(ਸਲੌਟ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
-    <string name="launch_by_default" msgid="1840761193189009248">"ਡਿਫ਼ੌਲਟ ਰੂਪ ਵਿੱਚ ਖੋਲ੍ਹੋ"</string>
+    <string name="launch_by_default" msgid="1840761193189009248">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਖੋਲ੍ਹੋ"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ਵਿੱਚ ਵਰਤਿਆ"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"ਖੁੱਲ੍ਹਣ ਵਾਲੇ ਲਿੰਕ"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"ਸਮਰਥਿਤ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
@@ -2770,7 +2773,7 @@
     <string name="filter_notif_priority_apps" msgid="5056470299318500609">"\"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\" ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਦੀ ਹੈ"</string>
     <string name="filter_notif_sensitive_apps" msgid="3847012996691991486">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਕੋਈ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
     <string name="filter_notif_hide_notifications_apps" msgid="3977513041080404368">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਕਦੇ ਨਹੀਂ ਵਿਖਾਈਆਂ ਗਈਆਂ"</string>
-    <string name="filter_notif_silent" msgid="8533960664617048281">"ਚੁੱਪ-ਚੁਪੀਤੇ ਵਿਖਾਈਆਂ ਗਈਆਂ"</string>
+    <string name="filter_notif_silent" msgid="8533960664617048281">"ਚੁੱਪ-ਚੁਪੀਤੇ ਵਿਖਾਈਆਂ"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ਐਪਸ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
@@ -2805,7 +2808,7 @@
     <string name="default_browser_title" msgid="8101772675085814670">"ਬ੍ਰਾਉਜ਼ਰ ਐਪ"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"ਕੋਈ ਡਿਫੌਲਟ ਬ੍ਰਾਊਜ਼ਰ ਨਹੀਂ"</string>
     <string name="default_phone_title" msgid="282005908059637350">"ਫ਼ੋਨ ਐਪ"</string>
-    <string name="default_app" msgid="6864503001385843060">"(ਡਿਫ਼ੌਲਟ)"</string>
+    <string name="default_app" msgid="6864503001385843060">"(ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(ਸਿਸਟਮ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ਐਪਸ ਸਟੋਰੇਜ਼"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ਈਥਰਨੈੱਟ ਡੈਟਾ ਉਪਯੋਗ"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ਈਥਰਨੈੱਟ"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> ਸੈਲਿਊਲਰ ਡੈਟਾ"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi ਡੈਟਾ"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ਈਥਰਨੈੱਟ ਡੈਟਾ"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ਡੈਟਾ ਚੇਤਾਵਨੀ / <xliff:g id="ID_2">%2$s</xliff:g> ਡੈਟਾ ਸੀਮਾ"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"ਬਿਲਿੰਗ ਚੱਕਰ"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ਡੈਟਾ ਸੀਮਾ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ਦੌਰਾਨ <xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
     <string name="configure" msgid="1029654422228677273">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"ਵਰਤੋਂ ਵਿੱਚ ਹੋਰ ਐਪਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">ਜਦੋਂ ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ</item>
       <item quantity="other">ਜਦੋਂ ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ</item>
@@ -3044,7 +3051,7 @@
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ਕਦੇ ਵੀ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s ਬੈਟਰੀ ਬਾਕੀ ਰਹਿਣ \'ਤੇ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ਬੈਟਰੀ ਔਪਟੀਮਾਈਜੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ"</string>
-    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲੌਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲੌਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ ਚੈਕਰ"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"ਸਪੈੱਲ ਚੈਕਰ ਚੁਣੋ"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 40bbfdf..4e5e919 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -392,7 +392,7 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowany"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania tabletu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania tabletu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania telefonu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia konieczne będzie odblokowanie ekranu, by odszyfrować dane. Jedynym innym sposobem odszyfrowania telefonu jest przywrócenie danych fabrycznych, co powoduje wymazanie wszystkich danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Dźwięk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dane w pamięci podręcznej"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Inne"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Przeglądaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Inne elementy to udostępnione pliki zapisane przez aplikacje, pliki pobrane z internetu lub przez Bluetooth, pliki Androida itp. \n\nAby wyświetlić całą zawartość nośnika <xliff:g id="NAME">^1</xliff:g>, dotknij Przeglądaj."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"System zawiera pliki używane wewnętrznie przez system operacyjny Android. \n\nNie można ich wyświetlić pojedynczo."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Użytkownik <xliff:g id="USER_0">^1</xliff:g> może mieć zapisane zdjęcia, muzykę, filmy, aplikacje i inne dane, które zajmują <xliff:g id="SIZE">^2</xliff:g> pamięci. \n\nAby wyświetlić szczegóły, przełącz na <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Skonfiguruj: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Użyj jako pamięci przenośnej"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string>
     <string name="manual" msgid="3025943393642974445">"Instrukcja"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Certyfikaty"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etykiety prawne"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacje prawne i dot. bezpieczeństwa"</string>
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Transmisja danych w sieci Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Komórkowa transmisja danych: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> wykorzystanych danych Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Dane w sieci Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Próg ostrzegawczy: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Próg ostrzegawczy: <xliff:g id="ID_1">%1$s</xliff:g> / Limit danych: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cykl rozliczeniowy"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limit danych"</string>
     <string name="data_usage_template" msgid="392191945602400904">"W okresie <xliff:g id="ID_2">%2$s</xliff:g> wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Skonfiguruj"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Inne aplikacje korzystające z transmisji danych"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacje mogą używać nieograniczonej ilości danych, gdy Oszczędzanie danych jest włączone</item>
       <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikacji może używać nieograniczonej ilości danych, gdy Oszczędzanie danych jest włączone</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8fd9f84..8c3396f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download usando a Internet ou o Bluetooth, arquivos Android e assim por diante. \n\nPara ver todo o conteúdo desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui arquivos usados internamente pelo sistema operacional Android. \n\nEsses arquivos não podem ser vistos individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Informações regulatórias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulatórias e de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Uso de dados ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de dados da rede celular"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de dados Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de dados ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g> / Limite de dados em <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturamento"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2262023..a2dfa5d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -284,11 +284,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Definir data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Definir data, hora, fuso horário e formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data e hora automáticas"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizar hora fornecida na rede"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizar hora fornecida na rede"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilizar hora fornecida pela rede"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilizar hora fornecida pela rede"</string>
     <string name="zone_auto" msgid="334783869352026648">"Fuso horário automático"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizar fuso horário fornecido na rede"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizar fuso horário fornecido na rede"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilizar fuso horário fornecido pela rede"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilizar fuso horário fornecido pela rede"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Utilizar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Os outros ficheiros incluem ficheiros partilhados guardados por aplicações, ficheiros transferidos da Internet ou através do Bluetooth, ficheiros Android, etc. \n\nPara ver todos os conteúdos deste <xliff:g id="NAME">^1</xliff:g>, toque em Explorar."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui ficheiros utilizados internamente pelo sistema operativo Android. \n\nNão é possível visualizar estes ficheiros individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> pode ter fotos, música, filmes, aplicações ou outros dados guardados que estejam a utilizar <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver detalhes, mude para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como armazenamento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuintes"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informações regulamentares"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiquetas regulamentares"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulamentares/de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Utilização de dados de Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de dados móveis"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de dados de Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de dados de Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados de <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados de <xliff:g id="ID_1">%1$s</xliff:g>/limite de dados de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturação"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8fd9f84..8c3396f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Áudio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dados em cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Outros"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Outros incluem arquivos compartilhados salvos por apps, arquivos transferidos por download usando a Internet ou o Bluetooth, arquivos Android e assim por diante. \n\nPara ver todo o conteúdo desse <xliff:g id="NAME">^1</xliff:g>, toque em \"Explorar\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"O sistema inclui arquivos usados internamente pelo sistema operacional Android. \n\nEsses arquivos não podem ser vistos individualmente."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"É possível que <xliff:g id="USER_0">^1</xliff:g> tenha salvado fotos, músicas, filmes, apps ou outros dados que estão ocupando <xliff:g id="SIZE">^2</xliff:g> de armazenamento. \n\nPara ver os detalhes, alterne para <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar seu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Usar como armazenamento portátil"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Informações regulatórias"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informações regulatórias e de segurança"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Uso de dados ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de dados da rede celular"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de dados Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> de dados ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Aviso de dados em <xliff:g id="ID_1">%1$s</xliff:g> / Limite de dados em <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de faturamento"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limite de dados"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s) entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Outros apps inclusos no uso"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps autorizados a usar dados irrestritos quando a Economia de dados estiver ativada</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4705ce2..9ca82bb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1104,8 +1104,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Datele memorate în cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altele"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorați <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Pot fi incluse fișiere trimise care au fost salvate de aplicații, fișiere descărcate de pe internet sau prin Bluetooth, fișiere Android și altele. \n\nPentru a vedea întregul conținut al stocării <xliff:g id="NAME">^1</xliff:g>, atingeți Explorați."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemul include fișiere folosite intern de sistemul de operare Android. \n\nAceste fișiere nu pot fi afișate individual."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Este posibil ca <xliff:g id="USER_0">^1</xliff:g> să fi salvat fotografii, muzică, filme, aplicați sau alte date care ocupă <xliff:g id="SIZE">^2</xliff:g> din spațiul de stocare. \n\nPentru a vedea detaliile, comutați la <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurați <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Folosiți ca stocare portabilă"</string>
@@ -1296,7 +1298,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informații de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informații reglementare"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etichete de reglementări"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informații despre siguranță/reglementări"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licență"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni și condiții"</string>
@@ -3035,9 +3038,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Utilizarea datelor ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> de date mobile"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> de date Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Date ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Avertisment pentru date: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avertisment pentru date: <xliff:g id="ID_1">%1$s</xliff:g>/Limită pentru date: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclu de facturare"</string>
@@ -3051,6 +3057,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limită de date"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Date utilizate în intervalul <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Configurați"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Alte aplicații incluse în utilizare"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplicații au permisiunea să utilizeze date nerestricționat când Economizorul de date e activat</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> de aplicații au permisiunea să utilizeze date nerestricționat când Economizorul de date e activat</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index af62319..dffec1b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Данные кеша"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Другое"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Документы с общим доступом, сохраненные приложениями, контент, скачанный из Интернета или по Bluetooth, служебные файлы Android и т. д.\n\nЧтобы узнать, какие данные есть на устройстве (<xliff:g id="NAME">^1</xliff:g>), нажмите \"Открыть\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Система включает файлы, используемые операционной системой Android.\n\nОни недоступны для просмотра."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>, возможно, хранит на запоминающем устройстве фотографии, музыку, приложения и другие данные общим объемом <xliff:g id="SIZE">^2</xliff:g>. \n\nЧтобы проверить это, войдите в аккаунт пользователя <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Настройте карту \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативный носитель"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Юридическая информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Участники"</string>
     <string name="manual" msgid="3025943393642974445">"Руководство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Сертификация"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Ярлыки сертификации"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безопасность и сертификация"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Передача данных Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Мобильные данные: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> данных Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Данные Ethernet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Предупреждения при передаче данных: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Предупреждения при передаче данных: <xliff:g id="ID_1">%1$s</xliff:g>/Лимит передачи данных: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Платежный цикл"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Установить лимит трафика"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Использовано за период <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Настроить"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Другие приложения"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> приложение может без ограничений передавать данные в режиме экономии трафика</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> приложения могут без ограничений передавать данные в режиме экономии трафика</item>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c7e75ac..40cb8e3 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ශ්‍රව්‍යය"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"හැඹිලිගත දත්ත"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"වෙනත්"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"පද්ධතිය"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ගවේෂණය කරන්න"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"වෙනත් ඒවාට යෙදුම් විසින් සුරැකි බෙදා ගන්නා ලද ගොනු, අන්තර්ජාලය හෝ බ්ලූටූත් වෙතින් බාගත් ගොනු, Android ගොනු සහ තවත් දේ ඇතුළත් විය හැකිය. \n\nමෙම <xliff:g id="NAME">^1</xliff:g>හි මුළු අන්තර්ගතය බැලීමට, ගවේෂණය කරන්න තට්ටු කරන්න."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"පද්ධතියට Android මෙහෙයුම් පද්ධතිය විසින් අභ්‍යන්තරව භාවිත කළ ගොනු ඇතුළත්ය. \n\nමෙම ගොනු තනි තනිව බැලීමට නොහැකිය."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> හට ගබඩාවෙන් <xliff:g id="SIZE">^2</xliff:g> ක් ගන්නා සුරැකි ඡායාරූප, සංගීතය, චිත්‍රපට, යෙදුම්, හෝ වෙනත් දත්ත තිබිය හැකිය. \n\nවිස්තර බැලීමට, <xliff:g id="USER_1">^1</xliff:g> වෙත මාරු වන්න."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ඔබගේ <xliff:g id="NAME">^1</xliff:g> සකසන්න"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"අතේ ගෙන යා හැකි ආචයනයක් ලෙස භාවිතා කරන්න"</string>
@@ -1288,7 +1290,8 @@
     <string name="legal_information" msgid="5769301644270604095">"නීතිමය තොරතුරු"</string>
     <string name="contributors_title" msgid="5917703088825286504">"දායකයන්"</string>
     <string name="manual" msgid="3025943393642974445">"අත්පොත"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"යාමන තොරතුරු"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"නියාමන ලේබල"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ආරක්ෂාව සහ නියාමන තොරතුරු"</string>
     <string name="copyright_title" msgid="865906688917260647">"ප්‍රකාශන හිමිකම"</string>
     <string name="license_title" msgid="1990487604356037871">"බලපත්‍රය"</string>
     <string name="terms_title" msgid="7697580845616764642">"නියමයන් සහ කොන්දේසි"</string>
@@ -3006,9 +3009,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ඊතර්නෙට් දත්ත භාවිතය"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ඊතර්නෙට්"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> සෙලියුලර් දත්ත"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi දත්ත"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ඊතර්නෙට් දත්ත"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> දත්ත අනතුරු ඇඟවීම"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> දත්ත අනතුරු ඇඟවීම / <xliff:g id="ID_2">%2$s</xliff:g> දත්ත සීමාව"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"බිල්පත් චක්‍රය"</string>
@@ -3022,6 +3028,7 @@
     <string name="data_limit" msgid="1885406964934590552">"දත්ත සීමාව"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g> අතර භාවිත විය"</string>
     <string name="configure" msgid="1029654422228677273">"වින්‍යාස කිරීම"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"භාවිතය තුළ ඇතුළත් වෙනත් යෙදුම්"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">දත්ත සුරැකුම ක්‍රියාත්මක විට බාධා නොකළ දත්ත භාවිත කිරීමට යොදුම් <xliff:g id="COUNT">%1$d</xliff:g>කට ඉඩ දෙන ලදී</item>
       <item quantity="other">දත්ත සුරැකුම ක්‍රියාත්මක විට බාධා නොකළ දත්ත භාවිත කිරීමට යොදුම් <xliff:g id="COUNT">%1$d</xliff:g>කට ඉඩ දෙන ලදී</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 19d3a2f..a8ddf4b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvuk"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dáta vo vyrovnávacej pamäti"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Iné"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk si chcete zobraziť celý obsah úložiska <xliff:g id="NAME">^1</xliff:g>, klepnite na tlačidlo Preskúmať."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systém obsahuje súbory interne používané operačným systémom Android. \n\nNemôžete si ich zobraziť individuálne."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Používateľ <xliff:g id="USER_0">^1</xliff:g> má pravdepodobne uložené fotky, hudbu, filmy, aplikácie alebo iné údaje, ktoré v úložisku zaberajú <xliff:g id="SIZE">^2</xliff:g>. \n\nAk si chcete zobraziť podrobné informácie, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Právne informácie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Prispievatelia"</string>
     <string name="manual" msgid="3025943393642974445">"Príručka"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Regulačné informácie"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulačné štítky"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Bezpečnostné a regulačné pokyny"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Spotreba dát prostredníctvom ethernetu"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobilné dáta: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> dát cez Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Dáta prostredníctvom ethernetu: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Upozornenie na dáta: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozornenie na dáta: <xliff:g id="ID_1">%1$s</xliff:g> / limit dát: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturačný cyklus"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Dátový limit"</string>
     <string name="data_usage_template" msgid="392191945602400904">"V období <xliff:g id="ID_2">%2$s</xliff:g> ste využili <xliff:g id="ID_1">%1$s</xliff:g> dát"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurovať"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Iné aplikácie zahrnuté v prehľade spotreby dát"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie majú povolené používať neobmedzené dáta, keď je zapnutý Šetrič dát</item>
       <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie má povolené používať neobmedzené dáta, keď je zapnutý Šetrič dáta</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c000560..daf368a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Zvok"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Predpomnjeni podatki"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Drugo"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Razišči: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Med drugimi datotekami so datoteke, ki jih shranijo aplikacije, datoteke, ki jih prenesete iz interneta ali prek Bluetootha, datoteke sistema Android in druge. \n\nČe si želite ogledati celotno vsebino te naprave za shranjevanje <xliff:g id="NAME">^1</xliff:g>, se dotaknite »Razišči«."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem vključuje datoteke, ki jih interno uporablja operacijski sistem Android. \n\nTeh datotek si ne morete posamično ogledati."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Uporabnik <xliff:g id="USER_0">^1</xliff:g> je morda shranil fotografije, glasbo, filme, aplikacije ali druge podatke, ki zasedajo <xliff:g id="SIZE">^2</xliff:g> shrambe. \n\nČe si želite ogledati podrobnosti, preklopite na uporabnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavitev imena za: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Uporaba kot prenosna shramba"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Sodelavci"</string>
     <string name="manual" msgid="3025943393642974445">"Ročno"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Zakonsko predpisani podatki"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Zakonsko predpisane oznake"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Varnostne in zakonsko predpisane informacije"</string>
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Preneseni podatki (ethernet)"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> prenesenih mobilnih podatkov"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> podatkov prek omrežij Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> podatkov prek etherneta"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>/omejitev prenosa podatkov: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunsko obdobje"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Uporabljeno: <xliff:g id="ID_1">%1$s</xliff:g> v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriranje"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Druge aplikacije, vključene v prikaz porabe"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one">Ko je vklopljeno varčevanje s podatki, je neomejen prenos podatkov dovoljen <xliff:g id="COUNT">%1$d</xliff:g> aplikaciji.</item>
       <item quantity="two">Ko je vklopljeno varčevanje s podatki, je neomejen prenos podatkov dovoljen <xliff:g id="COUNT">%1$d</xliff:g> aplikacijama.</item>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index be8d12e..23fe257 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Të dhënat e memories specifike"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Tjetër"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistemi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Eksploro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Përfshin po ashtu skedarët e ndarë që janë ruajtur nga aplikacionet, skedarët e shkarkuar nga interneti ose me Bluetooth, skedarët e Android e të tjera. \n\nPër të parë të gjitha përmbajtjet në këtë <xliff:g id="NAME">^1</xliff:g>, trokit tek \"Eksploro\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistemi përfshin skedarë që përdoren në nivel të brendshëm nga sistemi operativ Android. \n\nKëta skedarë nuk mund të shikohen individualisht."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> mund të ketë ruajtur fotografi, muzikë, filma, aplikacione ose të dhëna të tjera që po zënë <xliff:g id="SIZE">^2</xliff:g> nga hapësira ruajtëse. \n\npër të parë detajet, kalo te <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Përdore si hapësirë portative ruajtjeje"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Informacioni ligjor"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontribuuesit"</string>
     <string name="manual" msgid="3025943393642974445">"Manuale"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Informacion për rregullat"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Etiketat rregullatore"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Informacionet rregullatore dhe të sigurisë"</string>
     <string name="copyright_title" msgid="865906688917260647">"Të drejtat e autorit"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Kushtet e përgjithshme"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Përdorimi i të dhënave me eternet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Eterneti"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Të dhëna celulare <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> të dhëna me Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Të dhëna me eternet <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Paralajmërimi i të dhënave <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Paralajmërimi i të dhënave <xliff:g id="ID_1">%1$s</xliff:g> / Kufiri i të dhënave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cikli i faturimit"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Kufiri i të dhënave"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura mes datave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguro"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Aplikacionet e tjera të përfshira në përdorim"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacione lejohen të përdorin të dhëna të pakufizuara kur \"Kursyesi i të dhënave\" është aktiv</item>
       <item quantity="one">1 aplikacion lejohet të përdorë të dhëna të pakufizuara kur \"Kursyesi i të dhënave\" është aktiv</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 06a84d6..babdcc4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -844,8 +844,7 @@
     <item msgid="6200207341126893791">"1."</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Када је Позивање преко Wi-Fi-ја укључено, телефон може да преусмерава позиве преко Wi-Fi мрежа или мреже мобилног оператера у зависности од тога које сте подешавање изабрали и који сигнал је јачи. Пре него што укључите ову функцију, информишите се код мобилног оператера о накнадама и другим детаљима."</string>
-    <!-- no translation found for emergency_address_title (3571902448699714454) -->
-    <skip />
+    <string name="emergency_address_title" msgid="3571902448699714454">"Ажурирајте адресу за хитне случајеве"</string>
     <string name="home_settings" msgid="212375129455718176">"Почетна"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -1105,8 +1104,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудио"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кеширани подаци"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Друго"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи уређај <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Одељак Друго обухвата дељене датотеке које чувају апликације, датотеке преузете са интернета или помоћу Bluetooth-а, Android датотеке и слично. \n\nДа бисте видели целокупан садржај уређаја <xliff:g id="NAME">^1</xliff:g>, додирните Истражите."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Систем обухвата датотеке које оперативни систем Android користи интерно. \n\nОве датотеке не могу да се прегледају засебно."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> је можда сачувао/ла слике, музику, филмове, апликације или друге податке који заузимају <xliff:g id="SIZE">^2</xliff:g> меморије. \n\nДа бисте прегледали детаље, пребаците на корисника <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Подесите уређај <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи као преносиву меморију"</string>
@@ -1297,7 +1298,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правне информације"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Сарадници"</string>
     <string name="manual" msgid="3025943393642974445">"Упутство"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Регулативне информације"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулаторне ознаке"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безбедносне и регулаторне информације"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
@@ -3036,9 +3038,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Потрошња података на етернету"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Етернет"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> података за мобилне уређаје"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi података"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> података на етернету"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Упозорење за потрошњу података: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Упозорење за потрошњу података: <xliff:g id="ID_1">%1$s</xliff:g>/Ограничење за потрошњу података: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Обрачунски циклус"</string>
@@ -3052,6 +3057,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ограничење за потрошњу података"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g> у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Конфигуришите"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Друге апликације укључене у употребу"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> апликација има дозволу да користи неограничену количину података када је Уштеда података укључена</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> апликације имају дозволу да користе неограничену количину података када је Уштеда података укључена</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 57e4fea..c9123ed 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ljud"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Cachelagrad data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Övrigt"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforska <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Övrigt innehåller delade filer som har sparats av appar, filer som har laddats ned från internet eller via Bluetooth, Android-filer o.s.v. \n\nTryck på Utforska om du vill visa allt innehåll på <xliff:g id="NAME">^1</xliff:g>."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Systemet innehåller filer som används internt av operativsystemet Android \n\nDet går inte att visa dessa filer var och en för sig."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> kan ha sparade foton, musik, filmer, appar eller annan data som tar upp <xliff:g id="SIZE">^2</xliff:g> av lagringsutrymmet. \n\nByt till <xliff:g id="USER_1">^1</xliff:g> för mer information."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurera ditt <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Använd som bärbar lagringsenhet"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medarbetare"</string>
     <string name="manual" msgid="3025943393642974445">"Handbok"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Föreskrifter"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Föreskriftsetiketter"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Säkerhet och föreskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Användning av ethernetdata"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi-data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernetdata"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Datavarning vid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datavarning vid <xliff:g id="ID_1">%1$s</xliff:g>/datagräns på <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringsperiod"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Datagräns"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> har använts mellan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfigurera"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Andra appar som är inkluderade i användningen"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> appar har obegränsad dataåtkomst när Databesparing är aktiverat</item>
       <item quantity="one">1 app har obegränsad dataåtkomst när Databesparing är aktiverat</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1f47337..03ab90e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1098,8 +1098,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Sauti"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Data iliyowekwa kwenye akiba"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Nyingine"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Mfumo"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Gundua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Zingine ni pamoja na faili zinazoshirikiwa ambazo zimehifadhiwa na programu, faili zinazopakuliwa kutoka Intaneti au Bluetooth, faili za Android na zinginezo. \n\n Gonga Gundua ili uweze kuona maudhui yote ya <xliff:g id="NAME">^1</xliff:g> hii."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Mfumo unajumuisha faili zilizotumika ndani na mfumo wa uendeshaji wa Android. \n\nFaili hizi haziwezi kuangaliwa moja moja."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Huenda <xliff:g id="USER_0">^1</xliff:g> amehifadhi picha, muziki, filamu, programu, au data nyingine inayotumia nafasi ya <xliff:g id="SIZE">^2</xliff:g> ya hifadhi. \n\n Ili uweze kutazama maelezo, badilisha hadi <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Sanidi <xliff:g id="NAME">^1</xliff:g> yako"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Tumia kama hifadhi inayohamishika"</string>
@@ -1292,7 +1294,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Wachangiaji"</string>
     <string name="manual" msgid="3025943393642974445">"Mwongozo"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Maelezo ya udhibiti"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Lebo za udhibiti"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Maelezo ya udhibiti na usalama"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hakimiliki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
     <string name="terms_title" msgid="7697580845616764642">"Sheria na Masharti"</string>
@@ -3010,9 +3013,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Matumizi ya data ya ethaneti"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethaneti"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Data ya simu za mkononi ya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> ya data ya Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Data ya ethaneti ya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Onyo kuhusu data ya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Onyo kuhusu data ya <xliff:g id="ID_1">%1$s</xliff:g> / Kikomo cha data cha <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Kipindi cha kutuma bili"</string>
@@ -3026,6 +3032,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Kikomo cha data"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> zilitumiwa kati ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Weka mipangilio"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Programu zingine zilizojumuishwa katika matumizi"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Programu <xliff:g id="COUNT">%1$d</xliff:g> zimeruhusiwa kutumia data ambayo haijadhibitiwa wakati Kiokoa Data kimewashwa</item>
       <item quantity="one">Programu 1 imeruhusiwa kutumia data ambayo haijadhibitiwa wakati Kiokoa Data kimewashwa</item>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 16ae279..0898c7d 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -386,7 +386,7 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"என்க்ரிப்ட்"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"மொபைலை என்க்ரிப்ட் செய்"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"முறைமையாக்கப்பட்டது"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"என்க்ரிப்ட் செய்யப்பட்டது"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் டேப்லெட்டை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் டேப்லெட்டை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"உங்கள் கணக்குகள், அமைப்புகள், பதிவிறக்கிய பயன்பாடுகள் மற்றும் அவற்றின் தரவு, மீடியா மற்றும் பிற கோப்புகள் என அனைத்தையும் என்க்ரிப்ட் செய்யலாம். உங்கள் மொபைலை என்க்ரிப்ட் செய்த பிறகு, திரைப்பூட்டை (அதாவது வடிவம் அல்லது பின் அல்லது கடவுச்சொல்) அமைத்திருந்தால், ஒவ்வொரு முறையும் மொபைலை இயக்கும்போது குறிநீக்குவதற்கு திரையைத் திறக்க வேண்டும். உங்களின் எல்லா தரவையும் அழித்து, ஆரம்ப நிலைக்கு மீட்டமைப்பதே குறிநீக்குவதற்கான மற்றொரு வழியாகும்.\n\nஎன்க்ரிப்ட் செய்வதற்கு ஒரு மணிநேரம் அல்லது அதற்கு மேல் ஆகலாம். சார்ஜ் செய்த பேட்டரியுடன் தொடங்கி, செயல் முடியும் வரை சார்ஜ் ஆகும் நிலையிலேயே வைக்கவும். செயலில் குறுக்கிட்டால், உங்கள் தரவில் சிலவற்றை அல்லது மொத்தத்தையும் இழப்பீர்கள்."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"டேப்லெட்டை என்க்ரிப்ட் செய்"</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"தற்காலிகத் தரவு"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"பிற"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"முறைமை"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> இல் உலாவு"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"பயன்பாடுகளால் சேமிக்கப்பட்ட பகிர்ந்த கோப்புகள், இணையம் அல்லது புளூடூத்திலிருந்து இறக்கிய கோப்புகள், Android கோப்புகள் போன்றவை மற்றவையில் அடங்கும். \n\n<xliff:g id="NAME">^1</xliff:g> இன் எல்லா உள்ளடக்கத்தையும் பார்க்க, உலாவுக என்பதைத் தட்டவும்."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"முறைமையில், Android இயக்க முறைமை பயன்படுத்திய கோப்புகளும் உள்ளன. \n\nஇந்தக் கோப்புகளைத் தனித்தனியாகப் பார்க்க முடியாது."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"சேமிப்பகத்தில் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தும் படங்கள், இசை, திரைப்படங்கள், பயன்பாடுகள் அல்லது பிற தரவு போன்றவற்றை <xliff:g id="USER_0">^1</xliff:g> சேமித்து வைத்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_1">^1</xliff:g>க்கு மாறவும்."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>ஐ அமைக்கவும்"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"சட்டத் தகவல்"</string>
     <string name="contributors_title" msgid="5917703088825286504">"பங்களிப்பாளர்கள்"</string>
     <string name="manual" msgid="3025943393642974445">"கைமுறை"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ஒழுங்குமுறைத் தகவல்"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ஒழுங்குமுறை லேபிள்கள்"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"பாதுகாப்பு &amp; ஒழுங்குமுறைத் தகவல்"</string>
     <string name="copyright_title" msgid="865906688917260647">"பதிப்புரிமை"</string>
     <string name="license_title" msgid="1990487604356037871">"உரிமம்"</string>
     <string name="terms_title" msgid="7697580845616764642">"விதிமுறைகளும் நிபந்தனைகளும்"</string>
@@ -2851,13 +2854,13 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"இந்தச் சாதனத்தை சார்ஜ் செய்"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"இந்தச் சாதனத்தைச் சார்ஜ் செய்யும்"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"பவரை சப்ளை செய்"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"இணைக்கப்பட்ட பிற சாதனத்திற்குப் பவரை சப்ளை செய்"</string>
+    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"இணைக்கப்பட்ட பிற சாதனத்திற்குப் பவரை சப்ளை செய்யும்"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"கோப்புகளை இடமாற்று"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"கோப்புகளை மற்றொரு சாதனத்திற்கு இடமாற்று"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"கோப்புகளை மற்றொரு சாதனத்திற்கு இடமாற்றும்"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்கள் பரிமாற்றம் (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ஆதரிக்கப்படவில்லை எனில், படங்கள் அல்லது கோப்புகளைப் பரிமாற்றும் (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDI ஆகப் பயன்படுத்து"</string>
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்து"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3256040963685055320">"USBஐ இதற்குப் பயன்படுத்து:"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"பின்புலச் சோதனை"</string>
     <string name="background_check_title" msgid="4534254315824525593">"முழுமையான பின்புல அணுகல்"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ஈதர்நெட் தரவுப் பயன்பாடு"</string>
     <string name="wifi" msgid="1081550856200013637">"வைஃபை"</string>
     <string name="ethernet" msgid="6600095783781389720">"ஈதர்நெட்"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> செல்லுலார் தரவு"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> வைஃபை தரவு"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ஈதர்நெட் தரவு"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> தரவு எச்சரிக்கை / <xliff:g id="ID_2">%2$s</xliff:g> தரவு வரம்பு"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"பில்லிங் சுழற்சி"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"தரவு வரம்பு"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"உள்ளமை"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"தரவு உபயோகத்தில் உள்ளடங்கும் பிற பயன்பாடுகள்"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டன</item>
       <item quantity="one">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டது</item>
@@ -3157,5 +3164,5 @@
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"கைமுறை"</string>
     <string name="deletion_helper_preference_title" msgid="7719699175312011449">"இப்போது இடத்தைக் காலியாக்கு"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"சேமிப்பக நிர்வாகி"</string>
-    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"தன்னியக்க சேமிப்பிட மேலாண்மை சேவை"</string>
+    <string name="automatic_storage_manager_service_label" msgid="447065525699452191">"தன்னியக்க சேமிப்பக மேலாண்மை சேவை"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index bff4ca7..68c77f3 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"ఆడియో"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"కాష్ చేసిన డేటా"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ఇతరం"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"సిస్టమ్"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ఇతరంలో అనువర్తనాల ద్వారా సేవ్ చేయబడిన భాగస్వామ్య ఫైల్‌లు, ఇంటర్నెట్ లేదా బ్లూటూత్ నుండి డౌన్‌లోడ్ చేసిన ఫైల్‌లు, Android ఫైల్‌లు మొదలైనవి ఉంటాయి. \n\nఈ <xliff:g id="NAME">^1</xliff:g> మొత్తం కంటెంట్‌లను చూడటానికి, విశ్లేషించు నొక్కండి."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"సిస్టమ్‌లో Android ఆపరేటింగ్ సిస్టమ్ అంతర్గతంగా ఉపయోగించిన ఫైల్‌లు ఉన్నాయి. \n\nఈ ఫైల్‌లను ఒక్కొక్కటిగా వీక్షించలేరు."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> నిల్వలో <xliff:g id="SIZE">^2</xliff:g> పరిమాణాన్ని ఉపయోగిస్తున్నటువంటి సేవ్ చేయబడిన ఫోటోలు, సంగీతం, చలన చిత్రాలు, అనువర్తనాలు లేదా ఇతర డేటాను కలిగి ఉండవచ్చు. \n\nవివరాలను వీక్షించడానికి, <xliff:g id="USER_1">^1</xliff:g>కి మారండి."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"చట్టబద్ధమైన సమాచారం"</string>
     <string name="contributors_title" msgid="5917703088825286504">"సహకారులు"</string>
     <string name="manual" msgid="3025943393642974445">"మాన్యువల్"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"నియంత్రిత సమాచారం"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"నియంత్రణ లేబుల్‌లు"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"భద్రత &amp; నియంత్రణ సమాచారం"</string>
     <string name="copyright_title" msgid="865906688917260647">"కాపీరైట్"</string>
     <string name="license_title" msgid="1990487604356037871">"లైసెన్స్"</string>
     <string name="terms_title" msgid="7697580845616764642">"నిబంధనలు మరియు షరతులు"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ఈథర్‌నెట్ డేటా వినియోగం"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ఈథర్‌నెట్"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> సెల్యులార్ డేటా"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi డేటా"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ఈథర్‌నెట్ డేటా"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> డేటా హెచ్చరిక"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> డేటా హెచ్చరిక / <xliff:g id="ID_2">%2$s</xliff:g> డేటా పరిమితి"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"బిల్లింగ్ సైకిల్"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"డేటా పరిమితి"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> వ్యవధిలో <xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="configure" msgid="1029654422228677273">"కాన్ఫిగర్ చేయి"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"వినియోగంలో చేర్చబడిన ఇతర అనువర్తనాలు"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి</item>
       <item quantity="one">డేటా సేవర్ ఆన్‌లో ఉన్నప్పుడు అనియంత్రిత డేటాను ఉపయోగించడానికి 1 అనువర్తనం అనుమతించబడింది</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c0fec6d..92d5cf9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"เสียง"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ข้อมูลในแคช"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"อื่นๆ"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"ระบบ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"สำรวจ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"ข้อมูลอื่นรวมถึงไฟล์ที่แชร์ซึ่งแอปบันทึกไว้, ไฟล์ที่ดาวน์โหลดจากอินเทอร์เน็ตหรือบลูทูธ, ไฟล์ Android และอื่นๆ \n\nหากต้องการดูเนื้อหาทั้งหมดของ <xliff:g id="NAME">^1</xliff:g> นี้ ให้แตะสำรวจ"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"ระบบจะรวมไฟล์ที่ใช้ภายในโดยระบบปฏิบัติการ Android \n\nไม่สามารถดูไฟล์เหล่านี้ทีละไฟล์"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> อาจบันทึกรูปภาพ เพลง ภาพยนตร์ แอป หรือข้อมูลอื่นๆ ที่ใช้พื้นที่เก็บข้อมูล <xliff:g id="SIZE">^2</xliff:g> \n\nหากต้องการดูรายละเอียด ให้สลับไปยัง <xliff:g id="USER_1">^1</xliff:g>"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ตั้งค่า <xliff:g id="NAME">^1</xliff:g> ของคุณ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ใช้เป็นที่จัดเก็บข้อมูลแบบพกพา"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"ข้อมูลทางกฎหมาย"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ผู้ร่วมให้ข้อมูล"</string>
     <string name="manual" msgid="3025943393642974445">"คู่มือ"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"ข้อมูลเกี่ยวกับกฎระเบียบ"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ป้ายกำกับกฎข้อบังคับ"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"ข้อมูลความความปลอดภัยและกฎข้อบังคับ"</string>
     <string name="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ปริมาณการใช้อีเทอร์เน็ต"</string>
     <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
     <string name="ethernet" msgid="6600095783781389720">"อีเทอร์เน็ต"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"ข้อมูลเครือข่ายมือถือ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"อินเทอร์เน็ตผ่าน Wi-Fi <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"ข้อมูลอีเทอร์เน็ต <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"คำเตือนอินเทอร์เน็ต <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"คำเตือนอินเทอร์เน็ต <xliff:g id="ID_1">%1$s</xliff:g>/ขีดจำกัดอินเทอร์เน็ต <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"รอบการเรียกเก็บเงิน"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ขีดจำกัดอินเทอร์เน็ต"</string>
     <string name="data_usage_template" msgid="392191945602400904">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g> ระหว่างวันที่ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"กำหนดค่า"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"แอปอื่นๆ ที่รวมอยู่ในการใช้งาน"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
       <item quantity="one">1 แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 077ba33..c9ee66d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Naka-cache na data"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Iba Pa"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"I-explore ang <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Kabilang sa iba ang mga nakabahaging file na na-save ng mga app, mga file na na-download mula sa Internet o Bluetooth, mga file ng Android at marami pang iba. \n\nUpang makita ang lahat ng content ng <xliff:g id="NAME">^1</xliff:g> na ito, i-tap ang I-explore."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Kasama sa system ang mga file na ginagamit nang internal ng Android operating system. \n\nHindi matitingnan ang mga file na ito nang paisa-isa."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Maaaring may mga naka-save na larawan, musika, pelikula, app o iba pang data si <xliff:g id="USER_0">^1</xliff:g> na gumagamit ng <xliff:g id="SIZE">^2</xliff:g> ng storage. \n\nUpang makita ang mga detalye, lumipat kay <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"I-set up ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gamitin bilang portable na storage"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Legal na impormasyon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mga Taga-ambag"</string>
     <string name="manual" msgid="3025943393642974445">"Manual"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Impormasyon sa regulasyon"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Mga pangkontrol na label"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Info na pangkaligtasan at pangkontrol"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kondisyon"</string>
@@ -1368,7 +1371,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Kapareho ng screen lock ng device"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"Mga App"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Pamahalaan ang apps, mag-set up ng mga shortcut ng mabilisang paglunsad"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mga setting ng app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Hindi kilalang pinagmumulan"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Paggamit ng ethernet data"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> na cellular data"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> na Wi-Fi data"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> na ethernet data"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Babala kapag umabot sa <xliff:g id="ID_1">%1$s</xliff:g> ang Data"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Babala kapag umabot sa <xliff:g id="ID_1">%1$s</xliff:g> ang Data / Limitasyong <xliff:g id="ID_2">%2$s</xliff:g> na Data"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Yugto ng pagsingil"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Limitasyon ng data"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"I-configure"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Iba pang mga app na kasama sa paggamit"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> app ang pinapayagang gumamit ng hindi pinaghihigpitang data kapag naka-on ang Data Saver</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na app ang pinapayagang gumamit ng hindi pinaghihigpitang data kapag naka-on ang Data Saver</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4a39028..c9ee0ad 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Ses"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Önbelleğe alınan veriler"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Diğer"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> birimini keşfet"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Diğer seçeneği, uygulamalar tarafından kaydedilmiş paylaşılan dosyaları, İnternet\'ten veya Bluetooth\'tan indirilen dosyaları, Android dosyalarını vb. içerir. \n\nBu <xliff:g id="NAME">^1</xliff:g> içeriğinin tamamını görmek için Keşfet\'e hafifçe dokunun."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Sistem, Android işletim sistemi tarafından dahili olarak kullanılan dosyaları içerir. \n\nBu dosyalar ayrı ayrı görüntülenemez."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>, en fazla <xliff:g id="SIZE">^2</xliff:g> depolama alanı kaplayan kaydedilmiş fotoğraflar, müzik, film, uygulama veya diğer verileri içerebilir. \n\nAyrıntıları görmek için <xliff:g id="USER_1">^1</xliff:g> kullanıcısına geçiş yapın."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> cihazınızı kurun"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Taşınabilir bir depolama birimi kullanın"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Katkıda bulunanlar"</string>
     <string name="manual" msgid="3025943393642974445">"Manuel"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Düzenleme bilgileri"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Yönetmelik etiketleri"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Güvenlik ve yönetmelik bilgileri"</string>
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet veri kullanımı"</string>
     <string name="wifi" msgid="1081550856200013637">"Kablosuz"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> hücresel veri"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> kablosuz bağlantı verisi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ethernet verisi"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı / <xliff:g id="ID_2">%2$s</xliff:g> Veri sınırı"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faturalandırma döngüsü"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> tarihleri arasında <xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="configure" msgid="1029654422228677273">"Yapılandır"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Kullanıma dahil olan diğer uygulamalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Veri Tasarrufu açıkken <xliff:g id="COUNT">%1$d</xliff:g> uygulamanın sınırsız veri kullanmasına izin veriliyor</item>
       <item quantity="one">Veri Tasarrufu açıkken 1 uygulamanın sınırsız veri kullanmasına izin veriliyor</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b03c29f..aafd6bc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1114,8 +1114,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Аудіо"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Кешовані дані"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Інше"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Переглянути файли, які містить <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Інше – це файли, збережені додатками чи завантажені з Інтернету, файли Bluetooth, Android тощо. \n\nЩоб побачити всі файли, які містить <xliff:g id="NAME">^1</xliff:g>, торкніться опції \"Переглянути\"."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Система містить файли, які внутрішньо використовує ОС Android. \n\nЦі файли не можна переглядати окремо."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"Можливо, <xliff:g id="USER_0">^1</xliff:g> зберігає фотографії, музику, фільми, додатки або інші дані, які займають <xliff:g id="SIZE">^2</xliff:g> пам’яті. \n\nЩоб переглянути деталі, увійдіть як <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Налаштуйте пристрій пам’яті <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Використовувати як портативний пристрій пам’яті"</string>
@@ -1306,7 +1308,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Співавтори"</string>
     <string name="manual" msgid="3025943393642974445">"Посібник"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Нормативна інформація"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Регулятивні мітки"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Безпекова та нормативна інформація"</string>
     <string name="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
@@ -3066,9 +3069,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Використання трафіку Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> мобільного трафіку"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> трафіку Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> трафіку Ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Застереження про трафік: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Застереження про трафік: <xliff:g id="ID_1">%1$s</xliff:g> / Ліміт трафіку: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Платіжний цикл"</string>
@@ -3082,6 +3088,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Ліміт трафіку"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Налаштувати"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Інші додатки, які використовуються"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> додатку дозволено використовувати необмежений трафік, коли ввімкнено Заощадження трафіку</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> додаткам дозволено використовувати необмежений трафік, коли ввімкнено Заощадження трафіку</item>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index d13f4f7..c47acbf 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"آڈیو"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"کیش شدہ ڈیٹا"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"دیگر"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"سسٹم"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> دریافت کریں"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"‏دیگر میں شامل ہے ایپس کی جانب سے محفوظ کردہ اشتراک کردہ فائلیں، انٹرنیٹ یا بلوٹوتھ سے ڈاؤن لوڈ کی گئی فائلیں، Android فائلیں وغیرہ وغیرہ۔ \n\nاس <xliff:g id="NAME">^1</xliff:g> کا تمام مواد دیکھنے کیلئے دریافت کریں پر کلک کریں۔"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"‏سسٹم میں وہ فائلز شامل ہیں جو Android آپریٹنگ سسٹم داخلی طور پر استعمال کرتا ہے۔ \n\nیہ فائلز انفرادی طور پر نہیں دیکھی جا سکتیں۔"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> نے شاید تصاویر، موسیقی، موویز، ایپس یا کوئی اور ڈیٹا محفوظ کیا ہو جو اسٹوریج کی <xliff:g id="SIZE">^2</xliff:g> جگہ لے رہا ہے۔ \n\nتفصیلات دیکھنے کیلئے <xliff:g id="USER_1">^1</xliff:g> پر سوئچ کریں۔"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"اپنا <xliff:g id="NAME">^1</xliff:g> ترتیب دیں"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"پورٹیبل اسٹوریج کے بطور استعمال کریں"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
     <string name="contributors_title" msgid="5917703088825286504">"معاونین"</string>
     <string name="manual" msgid="3025943393642974445">"مینوئل"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"انضباطی معلومات"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"انضباطی لیبلز"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"حفاظت اور انضباطی معلومات"</string>
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرائط و ضوابط"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ایتھرنیٹ ڈیٹا کا استعمال"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"ایتھرنیٹ"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> سیلولر ڈیٹا"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"‏<xliff:g id="ID_1">%1$s</xliff:g>‏ Wi-Fi ڈیٹا"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> ایتھرنیٹ ڈیٹا"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ڈیٹا انتباہ"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ڈیٹا انتباہ / <xliff:g id="ID_2">%2$s</xliff:g> ڈیٹا کی حد"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"بلنگ سائیکل"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"ڈیٹا کی حد"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> کے درمیان <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="configure" msgid="1029654422228677273">"کنفیگر کریں"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"استعمال میں شامل دیگر ایپس"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">ڈیٹا سیور آن ہو تو <xliff:g id="COUNT">%1$d</xliff:g> ایپس کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
       <item quantity="one">ڈیٹا سیور آن ہو تو 1 ایپ کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index f514369..3ee0f62 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -49,7 +49,7 @@
     <item msgid="6415509612413178727">"30 daqiqa"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
-    <item msgid="8929270399652145290">"darhol"</item>
+    <item msgid="8929270399652145290">"Darhol"</item>
     <item msgid="6736512735606834431">"5 soniya"</item>
     <item msgid="8044619388267891375">"15 soniya"</item>
     <item msgid="1822002388249545488">"30 soniya"</item>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index f9e5639..e8dc646 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -301,17 +301,17 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaqt mintaqasi bo‘yicha saralash"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Sana"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vaqt"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Avtomatik qulflash"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uyg‘onganiga <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> bo‘ldi"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Uyqu rejimiga o’tishi bilanoq, <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> orqali qulfdan chiqarilgan holat bundan mustasno"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"Uyqu rejimiga o‘tgandan so‘ng <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> orqali qulfdan chiqarilgan holat bundan mustasno)"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Qurilmaning avtomatik qulflanishi"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"Uyqu rejimiga o‘tgach, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>dan keyin"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Uyqu rejimiga o‘tishi bilanoq (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ekranni yoniq holatda saqlab turishi mumkin)"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"Uyqu rejimiga o‘tgach, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>dan keyin (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ekranni yoniq holatda saqlab turishi mumkin)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Qulf ekranida egasi haqida ma’lumot ko‘rsatilsin"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Ekran qulfidagi matn"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Qulflangan ekran ustidagi matn"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Vidjetlarni yoqish"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Administrator tomonidan o‘chirilgan"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Yo‘q"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"M-n: Alisherning Androidi"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"M-n: Alisherning Android telefoni"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Foydalanuvchi ma‘lumoti"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profil ma‘lumotini qulflangan ekranda ko‘rsatish"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profil ma’lumotlari"</string>
@@ -354,11 +354,11 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"O‘chirish"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="9192567284554495805">"Boshladik!"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmog‘ingizni skanerr ustiga qo‘ying va tabranishni his qilganingizda uni oling."</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Barmog‘ingizni skaner ustiga qo‘yib, tebranishni his qilguncha bosib turing"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="4327640138658832625">"Ajoyib! Endi yana takrorlang"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Barmoq izi to‘liq olinishi uchun barmog‘ingizni sekin harakatlantiring."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Barmoq izi qo‘shildi!"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Ushbu belgi ko‘rinsa, siz identifikatsiya yoki xaridlarnini amalga oshirish uchun barmoq izidan foydalanishingiz mumkin."</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Quyidagi belgi identifikatsiyadan o‘tish yoki xaridlarni tasdiqlash uchun barmoq izidan foydalanish mumkinligini bildiradi."</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Qurilmani uyg‘otish va uni qulfdan chiqarish uchun shunchaki barmoq izi skaneriga tegining."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7280546429133276374">"Agar shu belgi ko‘rinsa, barmoq izidan foydalanish mumkin."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Barmoq izini sozlash o‘tkazib yuborilsinmi?"</string>
@@ -370,12 +370,12 @@
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Barmoq izini kiritish tugallanmadi"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Barmoq izini kiritish vaqti tugab qoldi. Qayta urinib ko‘ring."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Barmoq izini kiritish amalga oshmadi. Qayta urinib ko‘ring yoki boshqa barmoqdan foydalaning."</string>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Boshqa barmoq izini qo‘shish"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Yana qo‘shish"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Keyingisi"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Shuningdek, telefoningizni qulfdan chiqarish, xaridlarni tasdiqlash va ilovalarga kirish uchun ham barmoq izidan foydalanishingiz mumkin. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"Ekranni qulflash funksiyasi o‘chirib qo‘yilgan. Batafsil ma’lumot uchun tashkilotingiz administratori bilan bog‘laning. "<annotation id="admin_details">"Qo‘shimcha tafsilotlar"</annotation>\n\n"Shunday bo‘lsa-da, siz xaridlarni tasdiqlash va ilovalarga kirish uchun barmoq izidan foydalanishingiz mumkin. "<annotation id="url">"Batafsil ma’lumot"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Barmog‘ingizni ko‘tarib, keyin uni yana skanerga tekkizing."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Ushbu belgi ko‘rinsa, barmoq izidan foydalanishingiz mumkin."</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="4132164775128798343">"Quyidagi belgi barmoq izidan foydalanish mumkinligini bildiradi."</string>
     <string name="setup_fingerprint_enroll_finish_secondary_message" msgid="3734962461534384882">"Sozlamalarni o‘zgartirish uchun bu yerga o‘ting: Sozlamalar &gt; Xavfsizlik &gt; Barmoq izi"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Ko’pi bilan <xliff:g id="COUNT">%d</xliff:g> ta barmoq izi qo’shish mumkin"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Barmoq izlari olib tashlansinmi?"</string>
@@ -438,7 +438,7 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Himoyalanmagan"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Chizmali kalit"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"O‘rtacha darajadagi xavfsizlik"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-kod"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN kod"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"O‘rtachadan yuqoriga darajasidagi xavfsizlik"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parol"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Yuqori darajadagi xavfsizlik"</string>
@@ -451,7 +451,7 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Yo‘q"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Ekranni surish"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Chizmali kalit"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-kod"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kod"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Parol"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Agar ekranni qulflagan bo‘lsangiz, barmoq izlari yordamida ochishni Sozlamalar &gt; Xavfsizlik bandidan o‘rnatishingiz mumkin."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran qulfini o‘chirib qo‘yish"</string>
@@ -501,10 +501,10 @@
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Ishchi profilingiz va unga bog‘liq ma’lumotlar bu qurilmadan o‘chirib tashlanadi."</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Yopish"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parol kamida %d ta belgidan iborat bo‘lishi lozim"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-kod kamida %d ta raqamdan iborat bo‘lishi lozim"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kod kamida %d ta raqamdan iborat bo‘lishi shart"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davom etish"</string>
-    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parol <xliff:g id="NUMBER">%d</xliff:g> belgidan qisqaroq bo‘lishi lozim."</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kodi <xliff:g id="NUMBER">%d</xliff:g> raqamdan qisqaroq bo‘lishi lozim."</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parol ko‘pi bilan <xliff:g id="NUMBER">%d</xliff:g> ta belgidan iborat bo‘lishi kerak."</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN kod ko‘pi bilan <xliff:g id="NUMBER">%d</xliff:g> raqamdan iborat bo‘lishi kerak."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN kodda faqat 0-9 raqamlari bo‘lishi lozim."</string>
     <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Qurilma administratori yaqinda foydalanilgan PIN koddan yana foydalanishga ruxsat bermaydi."</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"Parolda nojoiz belgi mavjud."</string>
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kesh ma’lumotlari"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Boshqa"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Tizim"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Tizim fayllari Android operatsion tizimi tomonidan ishlatiladi. \n\nMazkur fayllarni alohida ko‘rib bo‘lmaydi."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> rasm, musiqa, film, ilova yoki <xliff:g id="SIZE">^2</xliff:g> xotirani egallagan boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Huquqiy ma’lumotlar"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Hissa qo‘shganlar"</string>
     <string name="manual" msgid="3025943393642974445">"Qo‘llanma"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Sertifikat ma’lumotlari"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Sertifikat yorliqlari"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Xavfsizlik va sertifikat ma’lumotlari"</string>
     <string name="copyright_title" msgid="865906688917260647">"Mualliflik huquqi"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsenziya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Foydalanish shartlari"</string>
@@ -1304,17 +1307,17 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Yuklanmoqda…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Parol tanlang"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chizmali kalit yarating"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN-kod kiriting"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PIN kod kiriting"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Parolni tasdiqlang"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Chizmali kalitni tasdiqlang"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN kodni kiriting"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Parol mos kelmadi"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-kod mos kelmadi"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Belgilanmani qulfdan ochish"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Qulfni ochish usuli"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Parol o‘rnatildi"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-kod o‘rnatildi"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Chizmali parol o‘rnatildi"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Davom etish uchun chizmali kalitni kiriting"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Davom etish uchun chizmali kalitni chizing"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Davom etish uchun qurilmangiz PIN kodini kiriting"</string>
     <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"Davom etish uchun qurilmangiz parolini kiriting"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"Davom etish uchun ishchi profilingiz chizmali kalitini kiriting"</string>
@@ -1332,9 +1335,9 @@
     <string name="lock_settings_title" msgid="4213839087748988686">"Qurilma xavfsizligi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Qulfni ochish chizmasini o‘zgartirish"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Qulfni ochish PIN kodini o‘zgartirish"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Qulfdan chiqarish kalitini chizing"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Qulfni ochish kalitini chizing"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yordam uchun Menyu‘ni bosing."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Tayyor bo‘lgach, barmoqni oling"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Tayyor bo‘lgach, barmog‘ingizni oling"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Kamida <xliff:g id="NUMBER">%d</xliff:g> ta nuqtani ulang"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Chizmali kalit saqlandi"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Kalitni yana bir marta chizing"</string>
@@ -1346,8 +1349,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Qulfni ochish chizmasi"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Chizmani so‘rash"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Ekran qulfini ochish uchun chizma chizishingiz kerak"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Chizmali kalit ko‘rsatilsin"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Chizmali kalitni ko‘rsatish"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Chizmali kalit ko‘rinib tursin"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Chizmali kalit ko‘rinib tursin"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Ekran bosilganda tebranish"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Quvvat tugmasi bilan qulflash"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> orqali qulfdan chiqarilgan holat bundan mustasno"</string>
@@ -1940,19 +1943,19 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"min"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Hisob ma’lumotlari ombori"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Xotiradan o‘rnatish"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Xotira kartasidan o‘rnatish"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD-kartadan o‘rnatish"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Sertifikatlarni xotira omboridan o\'rnatish"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Sertifikatlarni SD-kartadan o‘rnatish"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Hisob ma’lumotlarini tozalash"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"Barcha sertifikatlarni o‘chirish"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Barcha sertifikatlarni o‘chirib tashlash"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Ishonchli sertifikatlar"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ishonchli SM sertifikatlarini ko‘rsatish"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"Profil hisob ma’lumotlari"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"Hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"Foydalanuvchining hisob ma’lumotlari"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"Saqlab olingan hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Qo‘shimcha sozlamalar"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Ombor turi"</string>
-    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Apparat bilan qo‘llab-quvvatlangan"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Apparatli"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Faqat dasturiy"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1967,7 +1970,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Hisob ma’lumotlari omborini o‘chirib bo‘lmaydi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hisob ma’lumotlari ombori yoqilgan."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Hisob ma’lumotlari omboridan foydalanishdan oldin ekran qulfi uchun PIN-kod yoki parol o‘rnatish lozim."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Kirish huquqi bor ilovalar"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Foydalanish huquqi bor ilovalar"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Favqulodda vaziyat tovushi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Zaxira nusxa va asliga qaytarish"</string>
@@ -2683,8 +2686,8 @@
     <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator PIN kodini kiriting"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"YONIQ"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"O‘CHIQ"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"O‘zgarmas ekran"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Agar bu parametr yoqilsa, ekranda bir ilovadan ikkinchisiga o‘tishni taqiqlab qo‘yish mumkin.\n\nO‘zgarmas ekrandan foydalanish uchun:\n\n1. O‘zgarmas ekran funksiyasini yoqing.\n\n2. Kerakli ekranni oching.\n\n3. “Umumiy ma’lumot” tugmasini bosing.\n\n4. Ekranni barmog‘ingiz bilan tepaga suring va maxsus tugmani bosing."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Ekranni mahkamlash"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Agar bu parametr yoqilsa, ekranda bir ilovadan ikkinchisiga o‘tishni taqiqlab qo‘yish mumkin.\n\nEkranni mahkamlash uchun:\n\n1. Ekranni mahkamlash funksiyasini yoqing.\n\n2. Kerakli ekranni oching.\n\n3. “Umumiy ma’lumot” tugmasini bosing.\n\n4. Ekranni barmog‘ingiz bilan tepaga suring va mahkamlash tugmasini bosing."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Yechishdan oldin chizmali parol so‘ralsin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Yechishda PIN-kod so‘ralsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Yechishdan oldin parol so‘ralsin"</string>
@@ -2692,8 +2695,8 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu ishchi profil quyidagi tomonidan boshqariladi:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tomonidan boshqariladi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
-    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Qurilma aylanganda"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Tasvir ham burilsin"</string>
+    <string name="display_auto_rotate_title" msgid="6176450657107806043">"Qurilma burilganda"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Ekrandagi tasvir ham burilsin"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Tik holatda qolsin"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Yotiq holatda qolsin"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
@@ -2701,13 +2704,13 @@
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Xavfsiz ishga tushirish"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davom etish"</string>
     <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Qurilmani ishga tushirishda PIN-kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Qurilmani ishga tushirishda chizmali parol talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
+    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Shaxsiy ma’lumotlaringizni himoya qilish uchun qurilmani yoqishda chizmali kalit so‘raladigan qilib sozlab olishingiz mumkin. Qurilma qulfi ochilmaguncha qo‘ng‘iroqlar, xabar va bildirishnomalar, jumladan, uyg‘otkich signallaridan foydalanib bo‘lmaydi. \n\nBu usul yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
     <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Qurilmani ishga tushirishda parol talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda PIN-kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda chizmali kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
     <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
     <string name="encrypt_require_pin" msgid="2063945047845243752">"Qurilmani ishga tushirish uchun PIN-kod talab qilinsin"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Qurilmani ishga tushirish uchun chizmali parol talab qilinsin"</string>
+    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Qurilmani ishga tushirishda chizmali kalit so‘ralsin"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"Qurilmani ishga tushirish uchun parol talab qilinsin"</string>
     <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Yo‘q, kerak emas"</string>
     <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Yo‘q, kerak emas"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet ma’lumotlari sarfi"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"Mobil internet: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi trafik"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"Ethernet ma’lumotlari: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g> / Ma’lumotlarni uzatish cheklovi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"To‘lov davriyligi"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovini o‘rnatish"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> oraliqda <xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
     <string name="configure" msgid="1029654422228677273">"Sozlash"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Foydalanilayotgan boshqa ilovalar"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">Trafik tejash rejimi yoniqligida <xliff:g id="COUNT">%1$d</xliff:g> ta ilova internet-trafikdan cheklovsiz foydalanishi mumkin</item>
       <item quantity="one">Trafik tejash rejimi yoniqligida 1 ta ilova internet-trafikdan cheklovsiz foydalanishi mumkin</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c2adab2..1e80448 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Âm thanh"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Dữ liệu đã lưu vào bộ nhớ cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Dữ liệu khác"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Hệ thống"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Khám phá <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Tệp khác bao gồm tệp chia sẻ được ứng dụng lưu, tệp đã tải xuống từ Internet hoặc Bluetooth, tệp Android, v.v. \n\nĐể xem toàn bộ nội dung của <xliff:g id="NAME">^1</xliff:g> này, hãy nhấn vào Khám phá."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Hệ thống bao gồm các tệp mà hệ điều hành Android sử dụng nội bộ. \n\nKhông thể xem các tệp này riêng lẻ."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> có thể đã lưu ứng dụng, phim, nhạc, ảnh hoặc dữ liệu khác chiếm <xliff:g id="SIZE">^2</xliff:g> bộ nhớ. \n\nĐể xem chi tiết, hãy chuyển sang <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Thiết lập <xliff:g id="NAME">^1</xliff:g> của bạn"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sử dụng làm bộ nhớ di động"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Thông tin pháp lý"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Người đóng góp"</string>
     <string name="manual" msgid="3025943393642974445">"Hướng dẫn sử dụng"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Thông tin về quy định"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Nhãn theo quy định"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Thông tin về quy định và an toàn"</string>
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
@@ -3004,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Sử dụng dữ liệu ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> dữ liệu di động"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> dữ liệu Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> dữ liệu ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> cảnh báo dữ liệu"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> cảnh báo dữ liệu / <xliff:g id="ID_2">%2$s</xliff:g> giới hạn dữ liệu"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Chu kỳ thanh toán"</string>
@@ -3020,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Giới hạn dữ liệu"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> trong khoảng thời gian <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Định cấu hình"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Những ứng dụng khác được bao gồm trong mức sử dụng"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ứng dụng được phép sử dụng dữ liệu không hạn chế khi Trình tiết kiệm dữ liệu đang bật</item>
       <item quantity="one">1 ứng dụng được phép sử dụng dữ liệu không hạn chế khi Trình tiết kiệm dữ liệu đang bật</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bf1a3df..b724efc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -835,8 +835,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"开启“WLAN 通话”功能后,您的手机可根据您的偏好设置,通过 WLAN 网络或您的运营商网络通话(具体取决于哪个网络信号较强)。开启此功能之前,请先向您的运营商咨询收费情况及其他详情。"</string>
-    <!-- no translation found for emergency_address_title (3571902448699714454) -->
-    <skip />
+    <string name="emergency_address_title" msgid="3571902448699714454">"更新紧急地址"</string>
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -1095,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音频"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"缓存数据"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系统"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"浏览<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他文件包括应用所保存的共享文件,通过互联网或蓝牙下载的文件,Android 文件等。\n\n要查看此<xliff:g id="NAME">^1</xliff:g>中的全部内容,请点按“浏览”。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"“系统”中包含 Android 操作系统内部使用的文件。\n\n您无法逐个查看这些文件。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g>所保存的照片、音乐、电影、应用或其他数据可能占用了 <xliff:g id="SIZE">^2</xliff:g> 的存储空间。\n\n要查看详细信息,请切换到<xliff:g id="USER_1">^1</xliff:g>。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"设置您的<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"用作便携式存储设备"</string>
@@ -1287,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律信息"</string>
     <string name="contributors_title" msgid="5917703088825286504">"活动提供商"</string>
     <string name="manual" msgid="3025943393642974445">"手册"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"监管信息"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"监管标签"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全与监管信息"</string>
     <string name="copyright_title" msgid="865906688917260647">"版权"</string>
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</string>
@@ -3005,9 +3007,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"以太网流量消耗"</string>
     <string name="wifi" msgid="1081550856200013637">"WLAN"</string>
     <string name="ethernet" msgid="6600095783781389720">"以太网"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> 移动数据网络流量"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> WLAN 网络流量"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> 以太网流量"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"流量警告:<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"流量警告:<xliff:g id="ID_1">%1$s</xliff:g>/流量上限:<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"结算周期"</string>
@@ -3021,6 +3026,7 @@
     <string name="data_limit" msgid="1885406964934590552">"流量上限"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"配置"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"其他消耗流量的应用"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">已允许 <xliff:g id="COUNT">%1$d</xliff:g> 个应用在流量节省程序开启时无限量使用数据流量。</item>
       <item quantity="one">已允许 1 个应用在流量节省程序开启时无限量使用数据流量。</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 6b23608..575bbf2 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音效"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"快取資料"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索 <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他檔案包括由應用程式儲存的共用檔案、從互聯網或藍牙下載的檔案和 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」的完整內容,請輕按 [探索]。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"系統包含 Android 作業系統內部使用的檔案。\n\n使用者無法個別查看這些檔案。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> 可能已儲存佔用 <xliff:g id="SIZE">^2</xliff:g> 儲存空間的相片、音樂、影片、應用程式或其他資料。\n\n如要查看詳細資料,請切換至 <xliff:g id="USER_1">^1</xliff:g>。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定您的<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"作為可攜式儲存裝置使用"</string>
@@ -1287,7 +1289,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"作者"</string>
     <string name="manual" msgid="3025943393642974445">"手動"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"監管資訊"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"監管標籤"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全及監管資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
@@ -3009,9 +3012,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"以太網數據用量"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"以太網"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> 流動數據"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi 數據"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> 以太網數據"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告 / <xliff:g id="ID_2">%2$s</xliff:g> 數據上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"結算週期"</string>
@@ -3025,6 +3031,7 @@
     <string name="data_limit" msgid="1885406964934590552">"數據上限"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"其他使用數據的應用程式"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">「數據節省模式」開啟時,允許 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式使用無限制數據</item>
       <item quantity="one">「數據節省模式」開啟時,允許 1 個應用程式使用無限制數據</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e593300..ad08b23 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"音訊"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"快取資料"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"其他"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"其他檔案包括應用程式所儲存的共用檔案、透過網際網路或藍牙下載的檔案以及 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」的完整內容,請輕觸 [探索]。"</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"系統包括 Android 作業系統內部使用的檔案。\n\n您無法個別查看這些檔案。"</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"「<xliff:g id="USER_0">^1</xliff:g>」所儲存的相片、音樂、電影、應用程式或其他資料使用了 <xliff:g id="SIZE">^2</xliff:g> 的儲存空間。\n\n如要查看詳細資料,請切換為「<xliff:g id="USER_1">^1</xliff:g>」。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定您的「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"使用可攜式儲存空間"</string>
@@ -1286,7 +1288,8 @@
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
     <string name="contributors_title" msgid="5917703088825286504">"貢獻者"</string>
     <string name="manual" msgid="3025943393642974445">"說明書"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"法規資訊"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"法規標籤"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"安全和法規資訊"</string>
     <string name="copyright_title" msgid="865906688917260647">"版權"</string>
     <string name="license_title" msgid="1990487604356037871">"授權"</string>
     <string name="terms_title" msgid="7697580845616764642">"條款及細則"</string>
@@ -3008,9 +3011,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"乙太網路數據用量"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"乙太網路"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> 行動數據"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> Wi-Fi 數據用量"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> 乙太網路數據"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> 數據用量警告/<xliff:g id="ID_2">%2$s</xliff:g> 數據用量上限"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"帳單週期"</string>
@@ -3024,6 +3030,7 @@
     <string name="data_limit" msgid="1885406964934590552">"數據用量上限"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g>這段期間已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"設定"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"計入數據用量的其他應用程式"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="other">已允許 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式在數據節省模式開啟時無限量使用數據</item>
       <item quantity="one">已允許 1 個應用程式在數據節省模式開啟時無限量使用數據</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6d0960f..7acf37d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1094,8 +1094,10 @@
     <string name="storage_detail_audio" msgid="1197685141676483213">"Umsindo"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Idatha yenqolobane"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Okunye"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"Isistimu"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Hlola i-<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="5343550781234524040">"Okunye kufaka phakathi amafayela abiwe alondolozwe izinhlelo zokusebenza, amafayela alandwe kusuka ku-inthanethi noma i-Bluetooth, amafayela e-Android, kanjalo. \n\nUkuze ubone konke okuqukethwe kwale <xliff:g id="NAME">^1</xliff:g>, thepha okuthi Hlola."</string>
+    <string name="storage_detail_dialog_system" msgid="3058775028564971102">"Isistimu ifaka amafayela asetshenziswa ngaphakathi kwesistimu yokusebenza ye-Android. \n\nLawa mafayela awakwazi ukubukwa ngawodwana."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> ingahle ilondoloze izithombe, umculo, ama-movie, izinhlelo zokusebenza, nenye idatha ethatha u-<xliff:g id="SIZE">^2</xliff:g> wesitoreji. \n\nUkuze ubuke imininingwane, shintshela ku-<xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Setha i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Sebenzisa njengesitoreji esiphathekayo"</string>
@@ -1287,7 +1289,8 @@
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
     <string name="manual" msgid="3025943393642974445">"Ngokulawulwa"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Ulwazi lokuhlola"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Amalebula okuqondisa"</string>
+    <string name="safety_and_regulatory_info" msgid="7089050124905168081">"Ulwazi lokuphepha nokuqondisa"</string>
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
@@ -3005,9 +3008,12 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ukusetshenziswa kwedatha kwe-ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"I-Ethernet"</string>
-    <string name="cell_data_template" msgid="3308709914705592281">"<xliff:g id="ID_1">%1$s</xliff:g> idatha yeselula"</string>
-    <string name="wifi_data_template" msgid="501654649753761778">"<xliff:g id="ID_1">%1$s</xliff:g> idatha ye-Wi-Fi"</string>
-    <string name="ethernet_data_template" msgid="5775729859383597507">"<xliff:g id="ID_1">%1$s</xliff:g> idatha ye-ethernet"</string>
+    <!-- no translation found for cell_data_template (3269898985639199370) -->
+    <skip />
+    <!-- no translation found for wifi_data_template (986662116811359772) -->
+    <skip />
+    <!-- no translation found for ethernet_data_template (3354896094040996204) -->
+    <skip />
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Isexwayiso sedatha"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Isexwayiso sedatha / <xliff:g id="ID_2">%2$s</xliff:g> Umkhawulo wedatha"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Umjikelezo wokukhokha"</string>
@@ -3021,6 +3027,7 @@
     <string name="data_limit" msgid="1885406964934590552">"Umkhawulo wedatha"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenziswe phakathi kokungu-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Lungiselela"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ezinye izinhlelo zokusebenza ezifakwe ekusetshenzisweni"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> izinhlelo zokusebenza ezivunyelwe ukuze kusetshenziswe idatha engakhawulelwe uma Iseva Yedatha ivuliwe</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> izinhlelo zokusebenza ezivunyelwe ukuze kusetshenziswe idatha engakhawulelwe uma Iseva Yedatha ivuliwe</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b029799..4a5650f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2563,6 +2563,8 @@
     <string name="storage_detail_cached">Cached data</string>
     <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
     <string name="storage_detail_other">Other</string>
+    <!-- Item title describing internal storage used by the Android System [CHAR LIMIT=48]-->
+    <string name="storage_detail_system">System</string>
     <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
     <string name="storage_detail_explore">Explore <xliff:g id="name" example="SD card">^1</xliff:g></string>
 
@@ -2570,6 +2572,10 @@
     <string name="storage_detail_dialog_other">Other includes shared files saved by apps, files downloaded from the Internet or Bluetooth, Android files, and so on.
 \n\nTo see the entire contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>
 
+    <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->
+    <string name="storage_detail_dialog_system">System includes files used internally by the Android operating system.
+\n\nThese files can\u2019t be viewed individually.</string>
+
     <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
     <string name="storage_detail_dialog_user"><xliff:g id="user" example="Guest user">^1</xliff:g> may have saved photos, music, movies, apps, or other data that is taking up <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.
 \n\nTo view details, switch to <xliff:g id="user" example="Guest user">^1</xliff:g>.</string>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 7ec8a4d..74f873b 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -38,7 +38,7 @@
                 android:summary="@string/device_status_summary">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.deviceinfo.Status" />
+                    android:targetClass="com.android.settings.Settings$StatusActivity" />
         </PreferenceScreen>
 
         <!-- Manual -->
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 2cb5c6d..a0b7590 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -33,13 +33,13 @@
         android:title="@string/sim_status_title"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.deviceinfo.SimStatus" />
+            android:targetClass="com.android.settings.Settings$SimStatusActivity" />
     </PreferenceScreen>
     <PreferenceScreen android:key="imei_info"
         android:title="@string/imei_information_title"
         android:persistent="false">
         <intent android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />
+            android:targetClass="com.android.settings.Settings$ImeiInformationActivity" />
     </PreferenceScreen>
     <com.android.settings.CopyablePreference android:key="wifi_ip_address"
         android:enabled="false"
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 8c66fe1..f2af8f3 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -50,15 +50,6 @@
         android:enabled="false"
         android:selectable="false" />
 
-    <!-- Network reset -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="network_reset"
-        android:title="@string/reset_network_title"
-        settings:keywords="@string/keywords_network_reset"
-        settings:userRestriction="no_network_reset"
-        settings:useAdminDisabledSummary="true"
-        android:fragment="com.android.settings.ResetNetwork" />
-
     <!-- Factory reset -->
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 0ba10c0..68a867e 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -28,7 +28,7 @@
 
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.IccLockSettings"/>
+                    android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>
 
         </Preference>
 
diff --git a/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
index 4e5c5dd..bce03e5 100644
--- a/res/xml/testing_settings.xml
+++ b/res/xml/testing_settings.xml
@@ -37,7 +37,7 @@
         <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.wifi.WifiInfo" />
+                android:targetClass="com.android.settings.Settings$WifiInfoActivity" />
     </PreferenceScreen>
 
     <!--    
diff --git a/res/xml/testing_wifi_settings.xml b/res/xml/testing_wifi_settings.xml
index 7844aaa..4ee269a 100644
--- a/res/xml/testing_wifi_settings.xml
+++ b/res/xml/testing_wifi_settings.xml
@@ -23,7 +23,7 @@
                 <intent
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.wifi.WifiAPITest" />
+                android:targetClass="com.android.settings.Settings$WifiAPITestActivity" />
     </Preference>
 
     <Preference
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 0461bf8..e94db56 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -89,4 +89,13 @@
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title" />
 
+    <!-- Network reset -->
+    <com.android.settingslib.RestrictedPreference
+        android:key="network_reset"
+        android:title="@string/reset_network_title"
+        settings:keywords="@string/keywords_network_reset"
+        settings:userRestriction="no_network_reset"
+        settings:useAdminDisabledSummary="true"
+        android:fragment="com.android.settings.ResetNetwork" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 3163b63..8a963d8 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -16,8 +16,12 @@
 
 package com.android.settings;
 
+import static android.app.Activity.RESULT_OK;
+import static android.content.Context.TELEPHONY_SERVICE;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
@@ -31,6 +35,7 @@
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -38,14 +43,18 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnKeyListener;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
 import java.util.HashSet;
 import java.util.Set;
 
-public class ApnEditor extends InstrumentedPreferenceActivity
-        implements Preference.OnPreferenceChangeListener {
+public class ApnEditor extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, OnKeyListener {
 
     private final static String TAG = ApnEditor.class.getSimpleName();
 
@@ -60,7 +69,6 @@
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
     private static final int MENU_CANCEL = Menu.FIRST + 2;
-    private static final int ERROR_DIALOG_ID = 0;
 
     private static String sNotSet;
     private EditTextPreference mName;
@@ -152,7 +160,7 @@
 
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.apn_editor);
@@ -242,7 +250,7 @@
             return;
         }
 
-        mCursor = managedQuery(mUri, sProjection, null, null);
+        mCursor = getActivity().managedQuery(mUri, sProjection, null, null);
         mCursor.moveToFirst();
 
         mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
@@ -526,8 +534,8 @@
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         // If it's a new APN, then cancel will delete the new entry in onPause
         if (!mNewApn) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
@@ -537,7 +545,6 @@
             .setIcon(android.R.drawable.ic_menu_save);
         menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
             .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-        return true;
     }
 
     @Override
@@ -562,7 +569,13 @@
     }
 
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.setOnKeyListener(this);
+    }
+
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
         switch (keyCode) {
             case KeyEvent.KEYCODE_BACK: {
                 if (validateAndSave(false)) {
@@ -571,11 +584,11 @@
                 return true;
             }
         }
-        return super.onKeyDown(keyCode, event);
+        return false;
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle icicle) {
+    public void onSaveInstanceState(Bundle icicle) {
         super.onSaveInstanceState(icicle);
         if (validateAndSave(true)) {
             icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX));
@@ -595,7 +608,7 @@
         String mnc = checkNotSet(mMnc.getText());
 
         if (getErrorMsg() != null && !force) {
-            showDialog(ERROR_DIALOG_ID);
+            ErrorDialog.showError(this);
             return false;
         }
 
@@ -703,35 +716,6 @@
         return errorMsg;
     }
 
-    @Override
-    protected Dialog onCreateDialog(int id) {
-
-        if (id == ERROR_DIALOG_ID) {
-            String msg = getErrorMsg();
-
-            return new AlertDialog.Builder(this)
-                    .setTitle(R.string.error_title)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setMessage(msg)
-                    .create();
-        }
-
-        return super.onCreateDialog(id);
-    }
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        super.onPrepareDialog(id, dialog);
-
-        if (id == ERROR_DIALOG_ID) {
-            String msg = getErrorMsg();
-
-            if (msg != null) {
-                ((AlertDialog)dialog).setMessage(msg);
-            }
-        }
-    }
-
     private void deleteApn() {
         getContentResolver().delete(mUri, null, null);
         finish();
@@ -765,4 +749,24 @@
         }
     }
 
+    public static class ErrorDialog extends DialogFragment {
+
+        public static void showError(ApnEditor editor) {
+            ErrorDialog dialog = new ErrorDialog();
+            dialog.setTargetFragment(editor, 0);
+            dialog.show(editor.getFragmentManager(), "error");
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            String msg = ((ApnEditor) getTargetFragment()).getErrorMsg();
+
+            return new AlertDialog.Builder(getContext())
+                    .setTitle(R.string.error_title)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setMessage(msg)
+                    .create();
+        }
+    }
+
 }
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 25d4fb1..9d7f10a 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -31,7 +31,9 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
@@ -53,7 +55,7 @@
  * these operations.
  *
  */
-public class IccLockSettings extends InstrumentedPreferenceActivity
+public class IccLockSettings extends SettingsPreferenceFragment
         implements EditPinPreference.OnPinEnteredListener {
     private static final String TAG = "IccLockSettings";
     private static final boolean DBG = true;
@@ -153,12 +155,8 @@
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final Context context = getApplicationContext();
-        final TelephonyManager tm =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        final int numSims = tm.getSimCount();
 
         if (Utils.isMonkeyRunning()) {
             finish();
@@ -198,33 +196,53 @@
         // Don't need any changes to be remembered
         getPreferenceScreen().setPersistent(false);
 
-        if (numSims > 1) {
-            setContentView(R.layout.icc_lock_tabs);
+        mRes = getResources();
+    }
 
-            mTabHost = (TabHost) findViewById(android.R.id.tabhost);
-            mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
-            mListView = (ListView) findViewById(android.R.id.list);
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        final TelephonyManager tm =
+                (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        final int numSims = tm.getSimCount();
+        if (numSims > 1) {
+            View view = inflater.inflate(R.layout.icc_lock_tabs, container, false);
+            final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
+            Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+            View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+            prefs_container.addView(prefs);
+
+            mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
+            mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
+            mListView = (ListView) view.findViewById(android.R.id.list);
 
             mTabHost.setup();
             mTabHost.setOnTabChangedListener(mTabListener);
             mTabHost.clearAllTabs();
 
-            SubscriptionManager sm = SubscriptionManager.from(this);
+            SubscriptionManager sm = SubscriptionManager.from(getContext());
             for (int i = 0; i < numSims; ++i) {
                 final SubscriptionInfo subInfo = sm.getActiveSubscriptionInfoForSimSlotIndex(i);
                 mTabHost.addTab(buildTabSpec(String.valueOf(i),
                         String.valueOf(subInfo == null
-                            ? context.getString(R.string.sim_editor_title, i + 1)
+                            ? getContext().getString(R.string.sim_editor_title, i + 1)
                             : subInfo.getDisplayName())));
             }
             final SubscriptionInfo sir = sm.getActiveSubscriptionInfoForSimSlotIndex(0);
 
             mPhone = (sir == null) ? null
                 : PhoneFactory.getPhone(SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+            return view;
         } else {
             mPhone = PhoneFactory.getDefaultPhone();
+            return super.onCreateView(inflater, container, savedInstanceState);
         }
-        mRes = getResources();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         updatePreferences();
     }
 
@@ -243,13 +261,13 @@
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
         // ACTION_SIM_STATE_CHANGED is sticky, so we'll receive current state after this call,
         // which will call updatePreferences().
         final IntentFilter filter = new IntentFilter(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
-        registerReceiver(mSimStateReceiver, filter);
+        getContext().registerReceiver(mSimStateReceiver, filter);
 
         if (mDialogState != OFF_MODE) {
             showPinDialog();
@@ -260,13 +278,13 @@
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
-        unregisterReceiver(mSimStateReceiver);
+        getContext().unregisterReceiver(mSimStateReceiver);
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle out) {
+    public void onSaveInstanceState(Bundle out) {
         // Need to store this state for slider open/close
         // There is one case where the dialog is popped up by the preference
         // framework. In that case, let the preference framework store the
@@ -412,8 +430,8 @@
         if (success) {
             mPinToggle.setChecked(mToState);
         } else {
-            Toast.makeText(this, getPinPasswordErrorMessage(attemptsRemaining), Toast.LENGTH_LONG)
-                    .show();
+            Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
+                    Toast.LENGTH_LONG).show();
         }
         mPinToggle.setEnabled(true);
         resetDialogState();
@@ -421,11 +439,11 @@
 
     private void iccPinChanged(boolean success, int attemptsRemaining) {
         if (!success) {
-            Toast.makeText(this, getPinPasswordErrorMessage(attemptsRemaining),
+            Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
                     Toast.LENGTH_LONG)
                     .show();
         } else {
-            Toast.makeText(this, mRes.getString(R.string.sim_change_succeeded),
+            Toast.makeText(getContext(), mRes.getString(R.string.sim_change_succeeded),
                     Toast.LENGTH_SHORT)
                     .show();
 
@@ -476,7 +494,7 @@
         @Override
         public void onTabChanged(String tabId) {
             final int slotId = Integer.parseInt(tabId);
-            final SubscriptionInfo sir = SubscriptionManager.from(getBaseContext())
+            final SubscriptionInfo sir = SubscriptionManager.from(getActivity().getBaseContext())
                     .getActiveSubscriptionInfoForSimSlotIndex(slotId);
 
             mPhone = (sir == null) ? null
diff --git a/src/com/android/settings/InstrumentedPreferenceActivity.java b/src/com/android/settings/InstrumentedPreferenceActivity.java
deleted file mode 100644
index 3b19b33..0000000
--- a/src/com/android/settings/InstrumentedPreferenceActivity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2015 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;
-
-import com.android.internal.logging.MetricsLogger;
-
-/**
- * Instrumented activity that logs visibility state.
- */
-public abstract class InstrumentedPreferenceActivity extends PreferenceActivity {
-    /**
-     * Declare the view of this category.
-     *
-     * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent}
-     * or if there is no relevant existing category you may define one in
-     * {@link com.android.settings.InstrumentedFragment}.
-     */
-    protected abstract int getMetricsCategory();
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        MetricsLogger.visible(this, getMetricsCategory());
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        MetricsLogger.hidden(this, getMetricsCategory());
-    }
-}
diff --git a/src/com/android/settings/PreferenceActivity.java b/src/com/android/settings/PreferenceActivity.java
deleted file mode 100644
index 31b5f1f..0000000
--- a/src/com/android/settings/PreferenceActivity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2015 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;
-
-import android.annotation.Nullable;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-public class PreferenceActivity extends SettingsActivity {
-
-    private PreferenceActivityFragment mFragment;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        getIntent().putExtra(EXTRA_SHOW_FRAGMENT, PreferenceActivityFragment.class.getName());
-        super.onCreate(savedInstanceState);
-    }
-
-    public void addPreferencesFromResource(int resource) {
-        mFragment.addPreferencesFromResource(resource);
-    }
-
-    public Preference findPreference(String preference) {
-        return mFragment.findPreference(preference);
-    }
-
-    public PreferenceScreen getPreferenceScreen() {
-        return mFragment.getPreferenceScreen();
-    }
-
-    public void setPreferenceScreen(PreferenceScreen screen) {
-        mFragment.setPreferenceScreen(screen);
-    }
-
-    public boolean onPreferenceTreeClick(Preference preference) {
-        return false;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return super.isValidFragment(fragmentName)
-                || PreferenceActivityFragment.class.getName().equals(fragmentName);
-    }
-
-    public static class PreferenceActivityFragment extends SettingsPreferenceFragment {
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            ((PreferenceActivity) getActivity()).mFragment = this;
-        }
-
-        @Override
-        public boolean onPreferenceTreeClick(Preference preference) {
-            if (((PreferenceActivity) getActivity()).onPreferenceTreeClick(preference)) {
-                return true;
-            }
-            return super.onPreferenceTreeClick(preference);
-        }
-
-        @Override
-        protected int getMetricsCategory() {
-            if (getActivity() instanceof InstrumentedPreferenceActivity) {
-                return ((InstrumentedPreferenceActivity) getActivity()).getMetricsCategory();
-            }
-            return InstrumentedFragment.PREFERENCE_ACTIVITY_FRAGMENT;
-        }
-    }
-
-}
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7732837..9a2d14a 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -61,7 +61,6 @@
     private static final String CONFIGURE_ACCOUNT = "configure_account";
     private static final String DATA_MANAGEMENT = "data_management";
     private static final String BACKUP_INACTIVE = "backup_inactive";
-    private static final String NETWORK_RESET = "network_reset";
     private static final String FACTORY_RESET = "factory_reset";
     private static final String TAG = "PrivacySettings";
     private IBackupManager mBackupManager;
@@ -331,9 +330,5 @@
                 UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
             nonVisibleKeys.add(FACTORY_RESET);
         }
-        if (RestrictedLockUtils.hasBaseUserRestriction(context,
-                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
-            nonVisibleKeys.add(NETWORK_RESET);
-        }
     }
 }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1eb3af4..1bf1e0e 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -141,6 +141,16 @@
     public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
 
+    public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
+    public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
+    public static class IccLockSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ImeiInformationActivity extends SettingsActivity { /* empty */ }
+    public static class SimStatusActivity extends SettingsActivity { /* empty */ }
+    public static class StatusActivity extends SettingsActivity { /* empty */ }
+    public static class TestingSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }
+    public static class WifiInfoActivity extends SettingsActivity { /* empty */ }
+
     // Categories.
     public static class WirelessSettings extends SettingsActivity { /* empty */ }
     public static class DeviceSettings extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9a65d3c..330c9ea 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -57,6 +57,7 @@
 import com.android.settings.accessibility.CaptionPropertiesFragment;
 import com.android.settings.accounts.AccountSettings;
 import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.accounts.ChooseAccountActivity;
 import com.android.settings.accounts.ManagedProfileSettings;
 import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.applications.DrawOverlayDetails;
@@ -74,9 +75,12 @@
 import com.android.settings.dashboard.SearchResultsSummary;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deletionhelper.DeletionHelperFragment;
+import com.android.settings.deviceinfo.ImeiInformation;
 import com.android.settings.deviceinfo.PrivateVolumeForget;
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
 import com.android.settings.deviceinfo.PublicVolumeSettings;
+import com.android.settings.deviceinfo.SimStatus;
+import com.android.settings.deviceinfo.Status;
 import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageDetail;
@@ -119,6 +123,8 @@
 import com.android.settings.widget.SwitchBar;
 import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.SavedAccessPointsWifiSettings;
+import com.android.settings.wifi.WifiAPITest;
+import com.android.settings.wifi.WifiInfo;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -318,6 +324,7 @@
             AppNotificationSettings.class.getName(),
             OtherSoundSettings.class.getName(),
             ApnSettings.class.getName(),
+            ApnEditor.class.getName(),
             WifiCallingSettings.class.getName(),
             ZenModePrioritySettings.class.getName(),
             ZenModeAutomationSettings.class.getName(),
@@ -334,6 +341,14 @@
             VrListenerSettings.class.getName(),
             ManagedProfileSettings.class.getName(),
             DeletionHelperFragment.class.getName(),
+            ChooseAccountActivity.class.getName(),
+            IccLockSettings.class.getName(),
+            ImeiInformation.class.getName(),
+            SimStatus.class.getName(),
+            Status.class.getName(),
+            TestingSettings.class.getName(),
+            WifiAPITest.class.getName(),
+            WifiInfo.class.getName(),
     };
 
 
@@ -1068,7 +1083,7 @@
             for (DashboardCategory category : categories) {
                 for (Tile tile : category.tiles) {
                     ComponentName component = tile.intent.getComponent();
-                    if (packageName.equals(component)&& !ArrayUtils.contains(
+                    if (packageName.equals(component.getPackageName()) && !ArrayUtils.contains(
                             SETTINGS_FOR_RESTRICTED, component.getClassName())) {
                         setTileEnabled(component, false, isAdmin, pm);
                     }
@@ -1079,18 +1094,11 @@
 
     private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
                                 PackageManager pm) {
-        if (UserHandle.MU_ENABLED && !isAdmin
+        if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName())
                 && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) {
             enabled = false;
         }
-        int state = pm.getComponentEnabledSetting(component);
-        boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-        if (isEnabled != enabled) {
-            pm.setComponentEnabledSetting(component, enabled
-                    ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                    PackageManager.DONT_KILL_APP);
-        }
+        setTileEnabled(component, enabled);
     }
 
     private void getMetaData() {
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index a992897..4796a9e 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -23,6 +23,7 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.XmlRes;
@@ -42,6 +43,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.widget.FloatingActionButton;
 import com.android.settingslib.HelpUtils;
@@ -688,11 +690,35 @@
 
     public void finish() {
         Activity activity = getActivity();
-        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+        if (activity == null) return;
+        if (getFragmentManager().getBackStackEntryCount() > 0) {
+            getFragmentManager().popBackStack();
+        } else {
             activity.finish();
         }
     }
 
+    protected Intent getIntent() {
+        if (getActivity() == null) {
+            return null;
+        }
+        return getActivity().getIntent();
+    }
+
+    protected void setResult(int result, Intent intent) {
+        if (getActivity() == null) {
+            return;
+        }
+        getActivity().setResult(result, intent);
+    }
+
+    protected void setResult(int result) {
+        if (getActivity() == null) {
+            return;
+        }
+        getActivity().setResult(result);
+    }
+
     protected final Context getPrefContext() {
         return getPreferenceManager().getContext();
     }
@@ -704,10 +730,6 @@
             SettingsActivity sa = (SettingsActivity) activity;
             sa.startPreferencePanel(fragmentClass, extras, titleRes, null, caller, requestCode);
             return true;
-        } else if (activity instanceof PreferenceActivity) {
-            PreferenceActivity sa = (PreferenceActivity) activity;
-            sa.startPreferencePanel(fragmentClass, extras, titleRes, null, caller, requestCode);
-            return true;
         } else {
             Log.w(TAG,
                     "Parent isn't SettingsActivity nor PreferenceActivity, thus there's no way to "
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 7a6f252..264db52 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -20,15 +20,17 @@
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
 
-public class TestingSettings extends PreferenceActivity {
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+
+public class TestingSettings extends SettingsPreferenceFragment {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
         addPreferencesFromResource(R.xml.testing_settings);
 
-        final UserManager um = UserManager.get(this);
+        final UserManager um = UserManager.get(getContext());
         if (!um.isAdminUser()) {
             PreferenceScreen preferenceScreen = (PreferenceScreen)
                     findPreference("radio_info_settings");
@@ -36,4 +38,8 @@
         }
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.TESTING;
+    }
 }
diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index 18d59be..a66f208 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -6,6 +6,8 @@
 
 import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION;
 
+import com.android.settings.Settings.TestingSettingsActivity;
+
 
 public class TestingSettingsBroadcastReceiver extends BroadcastReceiver {
   
@@ -16,7 +18,7 @@
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().equals(SECRET_CODE_ACTION)) {
             Intent i = new Intent(Intent.ACTION_MAIN);
-            i.setClass(context, TestingSettings.class);
+            i.setClass(context, TestingSettingsActivity.class);
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(i);
         }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 72205eb..90dd9e0 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -90,6 +90,7 @@
 import android.widget.ListView;
 import android.widget.TabWidget;
 import com.android.internal.app.UnlaunchableAppActivity;
+import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.UserIcons;
 
 import java.io.IOException;
@@ -1028,12 +1029,13 @@
      * @throws SecurityException if the given userId does not belong to the current user group.
      */
     public static int enforceSameOwner(Context context, int userId) {
-        UserManager um = getUserManager(context);
-        if (!um.getUserProfiles().contains(new UserHandle(userId))) {
-            throw new SecurityException("Given user id " + userId + " does not belong to user "
-                    + UserHandle.myUserId());
+        final UserManager um = getUserManager(context);
+        final int[] profileIds = um.getProfileIdsWithDisabled(UserHandle.myUserId());
+        if (ArrayUtils.contains(profileIds, userId)) {
+            return userId;
         }
-        return userId;
+        throw new SecurityException("Given user id " + userId + " does not belong to user "
+                + UserHandle.myUserId());
     }
 
     /**
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 5b1d644..ddd45c3 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -72,6 +72,7 @@
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
+    private static final String KEY_NETWORK_RESET = "network_reset";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +337,12 @@
             p.setEnabled(!TetherSettings
                     .isProvisioningNeededButUnavailable(getActivity()));
         }
+
+        // Remove network reset if not allowed
+        if (RestrictedLockUtils.hasBaseUserRestriction(activity,
+                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+            removePreference(KEY_NETWORK_RESET);
+        }
     }
 
     @Override
@@ -470,6 +477,11 @@
                     result.add(KEY_WFC_SETTINGS);
                 }
 
+                if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                        UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
+                    result.add(KEY_NETWORK_RESET);
+                }
+
                 return result;
             }
         };
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 355031d..4e2ebce 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -30,6 +30,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -191,6 +192,16 @@
         mSwitchBar.setCheckedInternal(checked);
     }
 
+    /**
+     * Return whether the device is encrypted with legacy full disk encryption. Newer devices
+     * should be using File Based Encryption.
+     *
+     * @return true if device is encrypted
+     */
+    private boolean isFullDiskEncrypted() {
+        return StorageManager.isNonDefaultBlockEncrypted();
+    }
+
     private View createEnableDialogContentView(AccessibilityServiceInfo info) {
         LayoutInflater inflater = (LayoutInflater) getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
@@ -200,7 +211,7 @@
 
         TextView encryptionWarningView = (TextView) content.findViewById(
                 R.id.encryption_warning);
-        if (LockPatternUtils.isDeviceEncrypted()) {
+        if (isFullDiskEncrypted()) {
             String text = getString(R.string.enable_service_encryption_warning,
                     info.getResolveInfo().loadLabel(getPackageManager()));
             encryptionWarningView.setText(text);
@@ -273,7 +284,7 @@
                 // The user confirmed that they accept weaker encryption when
                 // enabling the accessibility service, so change encryption.
                 // Since we came here asynchronously, check encryption again.
-                if (LockPatternUtils.isDeviceEncrypted()) {
+                if (isFullDiskEncrypted()) {
                     mLockPatternUtils.clearEncryptionPassword();
                     Settings.Global.putInt(getContentResolver(),
                             Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, 0);
@@ -290,7 +301,7 @@
         switch (which) {
             case DialogInterface.BUTTON_POSITIVE:
                 if (mShownDialogId == DIALOG_ID_ENABLE_WARNING) {
-                    if (LockPatternUtils.isDeviceEncrypted()) {
+                    if (isFullDiskEncrypted()) {
                         String title = createConfirmCredentialReasonMessage();
                         Intent intent = ConfirmDeviceCredentialActivity.createIntent(title, null);
                         startActivityForResult(intent,
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index d9a181d..ce16ba3 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -34,6 +34,7 @@
 
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
+import com.android.settings.Settings;
 import com.android.settings.Utils;
 
 import java.io.IOException;
@@ -216,7 +217,7 @@
                 getIntent().getStringArrayExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY);
         final String[] accountTypes =
                 getIntent().getStringArrayExtra(AccountPreferenceBase.ACCOUNT_TYPES_FILTER_KEY);
-        final Intent intent = new Intent(this, ChooseAccountActivity.class);
+        final Intent intent = new Intent(this, Settings.ChooseAccountActivity.class);
         if (authorities != null) {
             intent.putExtra(AccountPreferenceBase.AUTHORITIES_FILTER_KEY, authorities);
         }
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 2f904cf..2e3280b 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.accounts;
 
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+import static android.content.Intent.EXTRA_USER;
+
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.content.ContentResolver;
@@ -32,14 +36,15 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.util.Log;
 
-import com.google.android.collect.Maps;
-
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.util.CharSequences;
-import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import com.google.android.collect.Maps;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,17 +52,13 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import static android.content.Intent.EXTRA_USER;
-
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Activity asking a user to select an account to be set up.
  *
  * An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
  * which the action needs to be performed is different to the one the Settings App will run in.
  */
-public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
+public class ChooseAccountActivity extends SettingsPreferenceFragment {
 
     private static final String TAG = "ChooseAccountActivity";
     private String[] mAuthorities;
@@ -97,7 +98,7 @@
     }
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.add_account_settings);
@@ -112,9 +113,9 @@
             }
         }
         mAddAccountGroup = getPreferenceScreen();
-        mUm = UserManager.get(this);
-        mUserHandle = Utils.getSecureTargetUser(getActivityToken(), mUm, null /* arguments */,
-                getIntent().getExtras());
+        mUm = UserManager.get(getContext());
+        mUserHandle = Utils.getSecureTargetUser(getActivity().getActivityToken(), mUm,
+                null /* arguments */, getIntent().getExtras());
         updateAuthDescriptions();
     }
 
@@ -123,7 +124,7 @@
      * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
      */
     private void updateAuthDescriptions() {
-        mAuthDescs = AccountManager.get(this).getAuthenticatorTypesAsUser(
+        mAuthDescs = AccountManager.get(getContext()).getAuthenticatorTypesAsUser(
                 mUserHandle.getIdentifier());
         for (int i = 0; i < mAuthDescs.length; i++) {
             mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
@@ -233,7 +234,8 @@
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
+                Context authContext = getActivity()
+                        .createPackageContextAsUser(desc.packageName, 0, mUserHandle);
                 icon = getPackageManager().getUserBadgedIcon(
                         authContext.getDrawable(desc.iconId), mUserHandle);
             } catch (PackageManager.NameNotFoundException e) {
@@ -259,7 +261,8 @@
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = createPackageContextAsUser(desc.packageName, 0, mUserHandle);
+                Context authContext = getActivity()
+                        .createPackageContextAsUser(desc.packageName, 0, mUserHandle);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "No label name for account type " + accountType);
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 0025b20..0964abe 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -1207,6 +1207,8 @@
             if (requestedPermissionCount == 0) {
                 summary = res.getString(
                         R.string.runtime_permissions_summary_no_permissions_requested);
+                mPermissionsPreference.setOnPreferenceClickListener(null);
+                mPermissionsPreference.setEnabled(false);
             } else {
                 final ArrayList<CharSequence> list = new ArrayList<>(grantedGroupLabels);
                 if (additionalGrantedPermissionCount > 0) {
@@ -1221,6 +1223,8 @@
                 } else {
                     summary = ListFormatter.getInstance().format(list);
                 }
+                mPermissionsPreference.setOnPreferenceClickListener(InstalledAppDetails.this);
+                mPermissionsPreference.setEnabled(true);
             }
             mPermissionsPreference.setSummary(summary);
         }
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index bd6ae5c..a1d19c0 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -32,7 +32,12 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.text.style.RelativeSizeSpan;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -182,15 +187,46 @@
         updateState();
     }
 
+    private static void verySmallSpanExcept(SpannableString s, CharSequence exception) {
+        final float SIZE = 0.8f * 0.8f;
+        final int FLAGS = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
+        final int exceptionStart = TextUtils.indexOf(s, exception);
+        if (exceptionStart == -1) {
+           s.setSpan(new RelativeSizeSpan(SIZE), 0, s.length(), FLAGS);
+        } else {
+            if (exceptionStart > 0) {
+                s.setSpan(new RelativeSizeSpan(SIZE), 0, exceptionStart, FLAGS);
+            }
+            final int exceptionEnd = exceptionStart + exception.length();
+            if (exceptionEnd < s.length()) {
+                s.setSpan(new RelativeSizeSpan(SIZE), exceptionEnd, s.length(), FLAGS);
+            }
+        }
+    }
+
+    private static CharSequence formatTitle(Context context, String template, long usageLevel) {
+        final SpannableString amountTemplate = new SpannableString(
+                context.getString(com.android.internal.R.string.fileSizeSuffix)
+                .replace("%1$s", "^1").replace("%2$s", "^2"));
+        verySmallSpanExcept(amountTemplate, "^1");
+        final Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
+                usageLevel, Formatter.FLAG_SHORTER);
+        final CharSequence formattedUsage = TextUtils.expandTemplate(amountTemplate,
+                usedResult.value, usedResult.units);
+
+        final SpannableString fullTemplate = new SpannableString(template.replace("%1$s", "^1"));
+        verySmallSpanExcept(fullTemplate, "^1");
+        return TextUtils.expandTemplate(fullTemplate,
+                BidiFormatter.getInstance().unicodeWrap(formattedUsage));
+    }
+
     private void updateState() {
         DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                 mDefaultTemplate);
         Context context = getContext();
         if (mSummaryPreference != null) {
-            Formatter.BytesResult usedResult = Formatter.formatBytes(context.getResources(),
-                    info.usageLevel, Formatter.FLAG_SHORTER);
-            mSummaryPreference.setAmount(usedResult.value);
-            mSummaryPreference.setUnits(getString(mDataUsageTemplate, usedResult.units));
+            mSummaryPreference.setTitle(
+                    formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));
             long limit = info.limitLevel;
             if (limit <= 0) {
                 limit = info.warningLevel;
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 6b63d55..7145212 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -27,10 +27,10 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
-import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
-public class ImeiInformation extends InstrumentedPreferenceActivity {
+public class ImeiInformation extends SettingsPreferenceFragment {
 
     private static final String KEY_PRL_VERSION = "prl_version";
     private static final String KEY_MIN_NUMBER = "min_number";
@@ -43,9 +43,9 @@
     private boolean isMultiSIM = false;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mSubscriptionManager = SubscriptionManager.from(this);
+        mSubscriptionManager = SubscriptionManager.from(getContext());
         final TelephonyManager telephonyManager =
             (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
         initPreferenceScreen(telephonyManager.getSimCount());
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index cdb0a02..41ae5fe 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -84,13 +84,17 @@
 
     private static final String TAG_RENAME = "rename";
     private static final String TAG_OTHER_INFO = "otherInfo";
+    private static final String TAG_SYSTEM_INFO = "systemInfo";
     private static final String TAG_USER_INFO = "userInfo";
     private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
 
+    private static final String EXTRA_VOLUME_SIZE = "volume_size";
+
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
 
     private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
             R.string.storage_detail_apps,
+            R.string.storage_detail_system,
     };
 
     private static final int[] ITEMS_SHOW_SHARED = new int[] {
@@ -98,7 +102,8 @@
             R.string.storage_detail_images,
             R.string.storage_detail_videos,
             R.string.storage_detail_audio,
-            R.string.storage_detail_other
+            R.string.storage_detail_system,
+            R.string.storage_detail_other,
     };
 
     private static final int DELETION_HELPER_SETTINGS = 1;
@@ -110,6 +115,8 @@
     private String mVolumeId;
     private VolumeInfo mVolume;
     private VolumeInfo mSharedVolume;
+    private long mTotalSize;
+    private long mSystemSize;
 
     private StorageMeasurement mMeasure;
 
@@ -152,6 +159,14 @@
         mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
         mVolume = mStorageManager.findVolumeById(mVolumeId);
 
+        final long sharedDataSize = mVolume.getPath().getTotalSpace();
+        mTotalSize = getArguments().getLong(EXTRA_VOLUME_SIZE, 0);
+        mSystemSize = mTotalSize - sharedDataSize;
+        if (mTotalSize <= 0) {
+            mTotalSize = sharedDataSize;
+            mSystemSize = 0;
+        }
+
         // Find the emulated shared storage layered above this private volume
         mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
 
@@ -240,17 +255,15 @@
             addPreference(screen, mExplore);
         }
 
-        final File file = mVolume.getPath();
-        final long totalBytes = file.getTotalSpace();
-        final long freeBytes = file.getFreeSpace();
-        final long usedBytes = totalBytes - freeBytes;
+        final long freeBytes = mVolume.getPath().getFreeSpace();
+        final long usedBytes = mTotalSize - freeBytes;
 
         final BytesResult result = Formatter.formatBytes(getResources(), usedBytes, 0);
         mSummary.setTitle(TextUtils.expandTemplate(getText(R.string.storage_size_large),
                 result.value, result.units));
         mSummary.setSummary(getString(R.string.storage_volume_used,
-                Formatter.formatFileSize(context, totalBytes)));
-        mSummary.setPercent((int) ((usedBytes * 100) / totalBytes));
+                Formatter.formatFileSize(context, mTotalSize)));
+        mSummary.setPercent((int) ((usedBytes * 100) / mTotalSize));
 
         mMeasure.forceMeasure();
         mNeedsUpdate = false;
@@ -285,6 +298,10 @@
     }
 
     private void addItem(PreferenceGroup group, int titleRes, CharSequence title, int userId) {
+        if (titleRes == R.string.storage_detail_system && mSystemSize <= 0) {
+            Log.w(TAG, "Skipping System storage because its size is " + mSystemSize);
+            return;
+        }
         StorageItemPreference item;
         if (mItemPoolIndex < mItemPreferencePool.size()) {
             item = mItemPreferencePool.get(mItemPoolIndex);
@@ -317,6 +334,10 @@
         return pref;
     }
 
+    static void setVolumeSize(Bundle args, long size) {
+        args.putLong(EXTRA_VOLUME_SIZE, size);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -471,6 +492,11 @@
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
 
             } break;
+            case R.string.storage_detail_system: {
+                SystemInfoFragment.show(this);
+                return true;
+
+            }
             case R.string.storage_detail_other: {
                 OtherInfoFragment.show(this, mStorageManager.getBestVolumeDescription(mVolume),
                         mSharedVolume);
@@ -541,6 +567,9 @@
                 itemTitleId = 0;
             }
             switch (itemTitleId) {
+                case R.string.storage_detail_system: {
+                    updatePreference(item, mSystemSize);
+                } break;
                 case R.string.storage_detail_apps: {
                     updatePreference(item, details.appsSize.get(userId));
                 } break;
@@ -577,7 +606,7 @@
     }
 
     private void updatePreference(StorageItemPreference pref, long size) {
-        pref.setStorageSize(size, mVolume.getPath().getTotalSpace());
+        pref.setStorageSize(size, mTotalSize);
     }
 
     private boolean isProfileOf(UserInfo user, UserInfo profile) {
@@ -668,6 +697,24 @@
         }
     }
 
+    public static class SystemInfoFragment extends DialogFragment {
+        public static void show(Fragment parent) {
+            if (!parent.isAdded()) return;
+
+            final SystemInfoFragment dialog = new SystemInfoFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_SYSTEM_INFO);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(R.string.storage_detail_dialog_system)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create();
+        }
+    }
+
     public static class OtherInfoFragment extends DialogFragment {
         public static void show(Fragment parent, String title, VolumeInfo sharedVol) {
             if (!parent.isAdded()) return;
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 610744b..e580afe 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.deviceinfo;
 
+import static android.content.Context.CARRIER_CONFIG_SERVICE;
+import static android.content.Context.TELEPHONY_SERVICE;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +30,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
+import android.telephony.CarrierConfigManager;
 import android.telephony.CellBroadcastMessage;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;
@@ -35,10 +39,11 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telephony.CarrierConfigManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
@@ -50,8 +55,9 @@
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
-import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 import java.util.List;
 
@@ -67,7 +73,7 @@
  * # Signal Strength
  *
  */
-public class SimStatus extends InstrumentedPreferenceActivity {
+public class SimStatus extends SettingsPreferenceFragment {
     private static final String TAG = "SimStatus";
 
     private static final String KEY_DATA_STATE = "data_state";
@@ -131,12 +137,13 @@
     };
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         mCarrierConfigManager = (CarrierConfigManager) getSystemService(CARRIER_CONFIG_SERVICE);
 
-        mSelectableSubInfos = SubscriptionManager.from(this).getActiveSubscriptionInfoList();
+        mSelectableSubInfos = SubscriptionManager.from(getContext())
+                .getActiveSubscriptionInfoList();
 
         addPreferencesFromResource(R.xml.device_info_sim_status);
 
@@ -145,17 +152,28 @@
         // Note - missing in zaku build, be careful later...
         mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
 
+        updatePhoneInfos();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         if (mSelectableSubInfos == null) {
             mSir = null;
         } else {
             mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
 
             if (mSelectableSubInfos.size() > 1) {
-                setContentView(R.layout.icc_lock_tabs);
+                View view = inflater.inflate(R.layout.icc_lock_tabs, container, false);
+                final ViewGroup prefs_container = (ViewGroup) view.findViewById(
+                        R.id.prefs_container);
+                Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+                View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+                prefs_container.addView(prefs);
 
-                mTabHost = (TabHost) findViewById(android.R.id.tabhost);
-                mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
-                mListView = (ListView) findViewById(android.R.id.list);
+                mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
+                mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
+                mListView = (ListView) view.findViewById(android.R.id.list);
 
                 mTabHost.setup();
                 mTabHost.setOnTabChangedListener(mTabListener);
@@ -167,7 +185,7 @@
                 }
             }
         }
-        updatePhoneInfos();
+        return super.onCreateView(inflater, container, savedInstanceState);
     }
 
     @Override
@@ -176,7 +194,7 @@
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
         if (mPhone != null) {
             updatePreference();
@@ -189,11 +207,12 @@
                     | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
                     | PhoneStateListener.LISTEN_SERVICE_STATE);
             if (mShowLatestAreaInfo) {
-                registerReceiver(mAreaInfoReceiver, new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
+                getContext().registerReceiver(mAreaInfoReceiver,
+                        new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
                         CB_AREA_INFO_SENDER_PERMISSION, null);
                 // Ask CellBroadcastReceiver to broadcast the latest area info received
                 Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
-                sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                getContext().sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
                         CB_AREA_INFO_SENDER_PERMISSION);
             }
         }
@@ -208,7 +227,7 @@
                     PhoneStateListener.LISTEN_NONE);
         }
         if (mShowLatestAreaInfo) {
-            unregisterReceiver(mAreaInfoReceiver);
+            getContext().unregisterReceiver(mAreaInfoReceiver);
         }
     }
 
@@ -250,7 +269,7 @@
 
         boolean show4GForLTE = false;
         try {
-            Context con = createPackageContext("com.android.systemui", 0);
+            Context con = getActivity().createPackageContext("com.android.systemui", 0);
             int id = con.getResources().getIdentifier("config_show4GForLTE",
                     "bool", "com.android.systemui");
             show4GForLTE = con.getResources().getBoolean(id);
@@ -395,7 +414,7 @@
             // TODO: http://b/23763013
             final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
                         mSir.getSubscriptionId()));
-            if (UserManager.get(this).isAdminUser()
+            if (UserManager.get(getContext()).isAdminUser()
                     && SubscriptionManager.isValidSubscriptionId(mSir.getSubscriptionId())) {
                 if (phone == null) {
                     Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 41f59ef..1ba3978 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.deviceinfo;
 
+import static android.content.Context.CONNECTIVITY_SERVICE;
+import static android.content.Context.WIFI_SERVICE;
+
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -37,8 +40,8 @@
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.util.ArrayUtils;
-import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 
 import java.lang.ref.WeakReference;
@@ -51,7 +54,7 @@
  * # XMPP/buzz/tickle status : TODO
  *
  */
-public class Status extends InstrumentedPreferenceActivity {
+public class Status extends SettingsPreferenceFragment {
 
     private static final String KEY_BATTERY_STATUS = "battery_status";
     private static final String KEY_BATTERY_LEVEL = "battery_level";
@@ -152,7 +155,7 @@
     }
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         mHandler = new MyHandler(this);
@@ -202,8 +205,8 @@
         // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
         // Also remove on Wi-Fi only devices.
         //TODO: the bug above will surface in split system user mode.
-        if (!UserManager.get(this).isAdminUser()
-                || Utils.isWifiOnly(this)) {
+        if (!UserManager.get(getContext()).isAdminUser()
+                || Utils.isWifiOnly(getContext())) {
             removePreferenceFromScreen(KEY_SIM_STATUS);
             removePreferenceFromScreen(KEY_IMEI_INFO);
         }
@@ -215,11 +218,12 @@
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
-        registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
+        getContext().registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
                          android.Manifest.permission.CHANGE_NETWORK_STATE, null);
-        registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        getContext().registerReceiver(mBatteryInfoReceiver,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
     }
 
@@ -227,8 +231,8 @@
     public void onPause() {
         super.onPause();
 
-        unregisterReceiver(mBatteryInfoReceiver);
-        unregisterReceiver(mConnectivityReceiver);
+        getContext().unregisterReceiver(mBatteryInfoReceiver);
+        getContext().unregisterReceiver(mConnectivityReceiver);
         mHandler.removeMessages(EVENT_UPDATE_STATS);
     }
 
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 5ae3986..8f0e91b 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -42,6 +42,7 @@
 import android.text.format.Formatter.BytesResult;
 import android.util.Log;
 import android.widget.Toast;
+
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -50,7 +51,6 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
-
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
@@ -88,6 +88,7 @@
     private PreferenceCategory mExternalCategory;
 
     private StorageSummaryPreference mInternalSummary;
+    private static long sTotalInternalStorage;
 
     @Override
     protected int getMetricsCategory() {
@@ -108,6 +109,8 @@
         mStorageManager = context.getSystemService(StorageManager.class);
         mStorageManager.registerListener(mStorageListener);
 
+        sTotalInternalStorage = mStorageManager.getPrimaryStorageSize();
+
         addPreferencesFromResource(R.xml.device_info_storage);
 
         mInternalCategory = (PreferenceCategory) findPreference("storage_internal");
@@ -162,15 +165,16 @@
             if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
                 final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length];
                 mInternalCategory.addPreference(
-                        new StorageVolumePreference(context, vol, color));
+                        new StorageVolumePreference(context, vol, color, sTotalInternalStorage));
                 if (vol.isMountedReadable()) {
                     final File path = vol.getPath();
                     privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
-                    privateTotalBytes += path.getTotalSpace();
+                    privateTotalBytes += sTotalInternalStorage > 0
+                            ? sTotalInternalStorage : path.getTotalSpace();
                 }
             } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
                 mExternalCategory.addPreference(
-                        new StorageVolumePreference(context, vol, COLOR_PUBLIC));
+                        new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0));
             }
         }
 
@@ -224,6 +228,7 @@
             // Only showing primary internal storage, so just shortcut
             final Bundle args = new Bundle();
             args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
+            PrivateVolumeSettings.setVolumeSize(args, sTotalInternalStorage);
             Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
                     PrivateVolumeSettings.class.getName(), args, null, R.string.apps_storage, null,
                     false);
@@ -268,6 +273,7 @@
             if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
                 final Bundle args = new Bundle();
                 args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
+                PrivateVolumeSettings.setVolumeSize(args, sTotalInternalStorage);
                 startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
                         -1, 0, args);
                 return true;
@@ -491,7 +497,11 @@
                     continue;
                 }
                 privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
-                privateTotalBytes += path.getTotalSpace();
+                if (info.getType() == VolumeInfo.TYPE_PRIVATE && sTotalInternalStorage > 0) {
+                    privateTotalBytes = sTotalInternalStorage;
+                } else {
+                    privateTotalBytes += path.getTotalSpace();
+                }
             }
             mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
                     Formatter.formatFileSize(mContext, privateUsedBytes),
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index dba636c..2ef42fa 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -46,7 +46,8 @@
     private int mColor;
     private int mUsedPercent = -1;
 
-    public StorageVolumePreference(Context context, VolumeInfo volume, int color) {
+    // TODO: ideally, VolumeInfo should have a total physical size.
+    public StorageVolumePreference(Context context, VolumeInfo volume, int color, long totalBytes) {
         super(context);
 
         mStorageManager = context.getSystemService(StorageManager.class);
@@ -68,8 +69,10 @@
         if (volume.isMountedReadable()) {
             // TODO: move statfs() to background thread
             final File path = volume.getPath();
+            if (totalBytes <= 0) {
+                totalBytes = path.getTotalSpace();
+            }
             final long freeBytes = path.getFreeSpace();
-            final long totalBytes = path.getTotalSpace();
             final long usedBytes = totalBytes - freeBytes;
 
             final String used = Formatter.formatFileSize(context, usedBytes);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 2db75a6..dbcd9ac 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -758,22 +758,10 @@
             final int inputMethodCount = (inputMethods == null ? 0 : inputMethods.size());
             for (int i = 0; i < inputMethodCount; ++i) {
                 InputMethodInfo inputMethod = inputMethods.get(i);
-
-                StringBuilder builder = new StringBuilder();
                 List<InputMethodSubtype> subtypes = inputMethodManager
                         .getEnabledInputMethodSubtypeList(inputMethod, true);
-                final int subtypeCount = subtypes.size();
-                for (int j = 0; j < subtypeCount; j++) {
-                    InputMethodSubtype subtype = subtypes.get(j);
-                    if (builder.length() > 0) {
-                        builder.append(',');
-                    }
-                    CharSequence subtypeLabel = subtype.getDisplayName(context,
-                            inputMethod.getPackageName(), inputMethod.getServiceInfo()
-                                    .applicationInfo);
-                    builder.append(subtypeLabel);
-                }
-                String summary = builder.toString();
+                String summary = InputMethodAndSubtypeUtil.getSubtypeLocaleNameListAsSentence(
+                        subtypes, context, inputMethod);
 
                 ServiceInfo serviceInfo = inputMethod.getServiceInfo();
                 ComponentName componentName = new ComponentName(serviceInfo.packageName,
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 03e97ff..a196ccf 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -189,8 +189,8 @@
             final InputMethodSubtype subtype = imi.getSubtypeAt(index);
             if (subtype.overridesImplicitlyEnabledSubtype()) {
                 if (autoSubtypeLabel == null) {
-                    autoSubtypeLabel = subtype.getDisplayName(
-                            context, imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                    autoSubtypeLabel = InputMethodAndSubtypeUtil.getSubtypeLocaleNameAsSentence(
+                            subtype, context, imi);
                 }
             } else {
                 final Preference subtypePref = new InputMethodSubtypePreference(
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index b79f44d..3d8d573 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -16,8 +16,13 @@
 
 package com.android.settings.inputmethod;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.icu.text.ListFormatter;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.support.v7.preference.Preference;
@@ -28,12 +33,14 @@
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import com.android.internal.app.LocaleHelper;
 import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 // TODO: Consolidate this with {@link InputMethodSettingValuesWrapper}.
@@ -370,4 +377,55 @@
             prefs.edit().remove(key).apply();
         }
     }
+
+    @NonNull
+    static String getSubtypeLocaleNameAsSentence(@Nullable InputMethodSubtype subtype,
+            @NonNull final Context context, @NonNull final InputMethodInfo inputMethodInfo) {
+        if (subtype == null) {
+            return "";
+        }
+        final Locale locale = getDisplayLocale(context);
+        final CharSequence subtypeName = subtype.getDisplayName(context,
+                inputMethodInfo.getPackageName(), inputMethodInfo.getServiceInfo()
+                        .applicationInfo);
+        return LocaleHelper.toSentenceCase(subtypeName.toString(), locale);
+    }
+
+    @NonNull
+    static String getSubtypeLocaleNameListAsSentence(
+            @NonNull final List<InputMethodSubtype> subtypes, @NonNull final Context context,
+            @NonNull final InputMethodInfo inputMethodInfo) {
+        if (subtypes.isEmpty()) {
+            return "";
+        }
+        final Locale locale = getDisplayLocale(context);
+        final int subtypeCount = subtypes.size();
+        final CharSequence[] subtypeNames = new CharSequence[subtypeCount];
+        for (int i = 0; i < subtypeCount; i++) {
+            subtypeNames[i] = subtypes.get(i).getDisplayName(context,
+                    inputMethodInfo.getPackageName(), inputMethodInfo.getServiceInfo()
+                            .applicationInfo);
+        }
+        return LocaleHelper.toSentenceCase(
+                ListFormatter.getInstance(locale).format(subtypeNames), locale);
+    }
+
+    @NonNull
+    private static Locale getDisplayLocale(@Nullable final Context context) {
+        if (context == null) {
+            return Locale.getDefault();
+        }
+        if (context.getResources() == null) {
+            return Locale.getDefault();
+        }
+        final Configuration configuration = context.getResources().getConfiguration();
+        if (configuration == null) {
+            return Locale.getDefault();
+        }
+        final Locale configurationLocale = configuration.getLocales().get(0);
+        if (configurationLocale == null) {
+            return Locale.getDefault();
+        }
+        return configurationLocale;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index f373749..1d4fa67 100755
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -39,7 +39,6 @@
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.text.Collator;
-import java.util.ArrayList;
 import java.util.List;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -213,17 +212,10 @@
     }
 
     private String getSummaryString() {
-        final Context context = getContext();
         final InputMethodManager imm = getInputMethodManager();
         final List<InputMethodSubtype> subtypes = imm.getEnabledInputMethodSubtypeList(mImi, true);
-        final ArrayList<CharSequence> subtypeLabels = new ArrayList<>();
-        for (final InputMethodSubtype subtype : subtypes) {
-            final CharSequence label = subtype.getDisplayName(
-                  context, mImi.getPackageName(), mImi.getServiceInfo().applicationInfo);
-            subtypeLabels.add(label);
-        }
-        // TODO: A delimiter of subtype labels should be localized.
-        return TextUtils.join(", ", subtypeLabels);
+        return InputMethodAndSubtypeUtil.getSubtypeLocaleNameListAsSentence(
+                subtypes, getContext(), mImi);
     }
 
     private void showSecurityWarnDialog(final InputMethodInfo imi) {
diff --git a/src/com/android/settings/inputmethod/InputMethodSubtypePreference.java b/src/com/android/settings/inputmethod/InputMethodSubtypePreference.java
index 7321b08..600542a 100644
--- a/src/com/android/settings/inputmethod/InputMethodSubtypePreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodSubtypePreference.java
@@ -41,8 +41,8 @@
         super(context);
         setPersistent(false);
         setKey(imi.getId() + subtype.hashCode());
-        final CharSequence subtypeLabel = subtype.getDisplayName(context,
-                imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+        final CharSequence subtypeLabel =
+                InputMethodAndSubtypeUtil.getSubtypeLocaleNameAsSentence(subtype, context, imi);
         setTitle(subtypeLabel);
         final String subtypeLocaleString = subtype.getLocale();
         if (TextUtils.isEmpty(subtypeLocaleString)) {
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 0117a69..e22d22c 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -496,8 +496,8 @@
                 @NonNull Context context, @NonNull InputMethodInfo imi,
                 @Nullable InputMethodSubtype imSubtype) {
             if (imSubtype != null) {
-                return imSubtype.getDisplayName(
-                        context, imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                return InputMethodAndSubtypeUtil.getSubtypeLocaleNameAsSentence(
+                        imSubtype, context, imi);
             }
             return null;
         }
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java
index e6bf6b8..6abf67d 100644
--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import static android.content.Context.WIFI_SERVICE;
+
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.net.wifi.WifiManager;
@@ -25,15 +27,16 @@
 import android.text.Editable;
 import android.widget.EditText;
 
-import com.android.settings.PreferenceActivity;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
 
 /**
  * Provide an interface for testing out the Wifi API
  */
-public class WifiAPITest extends PreferenceActivity implements
-Preference.OnPreferenceClickListener {
+public class WifiAPITest extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceClickListener {
 
     private static final String TAG = "WifiAPITest";
     private int netid;
@@ -58,15 +61,14 @@
     //============================
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        onCreatePreferences();
         mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
     }
 
-
-    private void onCreatePreferences() {
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.layout.wifi_api_test);
 
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
@@ -82,6 +84,11 @@
 
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.TESTING;
+    }
+
     //============================
     // Preference callbacks
     //============================
@@ -99,11 +106,11 @@
         if (pref == mWifiDisconnect) {
             mWifiManager.disconnect();
         } else if (pref == mWifiDisableNetwork) {
-            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+            AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
             alert.setTitle("Input");
             alert.setMessage("Enter Network ID");
             // Set an EditText view to get user input
-            final EditText input = new EditText(this);
+            final EditText input = new EditText(getPrefContext());
             alert.setView(input);
             alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
@@ -125,11 +132,11 @@
                     });
             alert.show();
         } else if (pref == mWifiEnableNetwork) {
-            AlertDialog.Builder alert = new AlertDialog.Builder(this);
+            AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
             alert.setTitle("Input");
             alert.setMessage("Enter Network ID");
             // Set an EditText view to get user input
-            final EditText input = new EditText(this);
+            final EditText input = new EditText(getPrefContext());
             alert.setView(input);
             alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java
index a431a82..373a587 100644
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -18,19 +18,24 @@
 
 import android.os.Bundle;
 
-import com.android.settings.PreferenceActivity;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
 
 /**
  * Wifi information menu item on the diagnostic screen
  */
-public class WifiInfo extends PreferenceActivity {
+public class WifiInfo extends SettingsPreferenceFragment {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.testing_wifi_settings);
     }
 
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsEvent.TESTING;
+    }
 }