diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 6f0ff09..b4915b9 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -533,86 +533,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_captured_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="54"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="55"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_bg_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="56"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_fill_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="57"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="58"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;message_bubble_incoming&quot;>#52534D&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -677,86 +597,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_captured_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="205"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_fp_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="206"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_bg_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="207"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_fill_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="208"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;sfps_enrollment_progress_bar_error_color&quot;>#ffffffff&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="209"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;message_icon_background_outgoing&quot;>#FBBC04&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -5005,36 +4845,4 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                    android:progressBackgroundTint=&quot;@color/sfps_enrollment_progress_bar_bg_color&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/sfps_enroll_enrolling.xml"
-            line="71"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                    android:progressBackgroundTint=&quot;@color/sfps_enrollment_progress_bar_bg_color&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/sfps_enroll_enrolling.xml"
-            line="71"
-            column="20"/>
-    </issue>
-
 </issues>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 70ccfb6..9962d3d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Vingerafdruk + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Vingerafdruk + Wagwoord"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Gaan voort sonder vingerafdruk"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Jy kan jou foon met jou vingerafdruk ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Jy kan jou foon met jou vingerafdruk ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Gesigslot + patroon"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Gesigslot + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Gesigslot + wagwoord"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Gaan voort sonder Gesigslot"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Jy kan jou foon met jou gesig ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Jy kan jou foon met jou gesig ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Patroon • Gesig • Vingerafdruk"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Gesig • Vingerafdruk"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Wagwoord • Gesig • Vingerafdruk"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Gaan voort sonder Gesigslot of Vingerafdruk"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Jy kan jou foon met jou gesig of vingerafdruk ontsluit. Om veiligheidsredes vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Jy kan jou foon met jou gesig of vingerafdruk ontsluit. Om veiligheidsredes vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swiep"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Jy kan begin om jou <xliff:g id="NAME">^1</xliff:g> te gebruik"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batterystatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batteryvlak"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeenskaplik"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeenskaplike instellings"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Toegangspuntname"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redigeer toegangspunt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nie gestel nie"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 294592c..9bd59ec 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"የጣት አሻራ + ፒን"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"የጣት አሻራ + የይለፍ ቃል"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ያለጣት አሻራ ይቀጥሉ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"የእርስዎን የጣት አሻራ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"የእርስዎን የጣት አሻራ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"በመልክ መክፈት + ስርዓተ ጥለት"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"በመልክ መክፈት + ፒን"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"በመልክ መክፈት + የይለፍ ቃል"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ያለመልክ መክፈት ይቀጥሉ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"የእርስዎን መልክ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"የእርስዎን መልክ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ስርዓተ ጥለት • መልክ • የጣት አሻራ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ፒን • መልክ • የጣት አሻራ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"የይለፍ ቃል • መልክ • የጣት አሻራ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ያለመልክ ወይም የጣት አሻራ ይቀጥሉ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"የእርስዎን መልክ ወይም የጣት አሻራ በመጠቀም ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የምትኬ የማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"የእርስዎን መልክ ወይም የጣት አሻራ በመጠቀም ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የምትኬ የማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"በአስተዳዳሪ፣ የምስጠራ መመሪያ ወይም የምስክርነት ማከማቻ ተሰናክሏል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ማንሸራተት"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"የእርስዎን <xliff:g id="NAME">^1</xliff:g> መጠቀም መጀመር ይችላሉ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"የባትሪደረጃ፡"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"የጋራ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"የጋራ ቅንብሮች"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"የመዳረሻ ነጥብ አርትዕ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"አልተዘጋጀም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bdfce42..6a5f926 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -750,17 +750,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"بصمة الإصبع ورقم التعريف الشخصي"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"بصمة الإصبع وكلمة المرور"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"المتابعة بدون بصمة الإصبع"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"يمكنك فتح قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"يمكنك فتح قفل هاتفك باستخدام بصمة إصبعك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"فتح الجهاز بالتعرف على الوجه + نقش"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"فتح الجهاز بالتعرف على الوجه + رقم تعريف شخصي"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"فتح الجهاز بالتعرف على الوجه + كلمة مرور"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"المتابعة بدون إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"النقش • الوجه • بصمة الإصبع"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"رقم التعريف الشخصي • الوجه • بصمة الإصبع"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"كلمة المرور • الوجه • بصمة الإصبع"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"المتابعة بدون إعداد وجه أو بصمة إصبع"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"يمكنك فتح قفل هاتفك باستخدام وجهك أو بصمة إصبعك. ولأغراض تتعلق بالأمان، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"يمكنك فتح قفل هاتفك باستخدام وجهك أو بصمة إصبعك. ولأغراض تتعلق بالأمان، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"تم إيقافه بواسطة المشرف، أو سياسة التشفير، أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"بدون قفل"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"التمرير السريع"</string>
@@ -1869,10 +1881,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"بإمكانك بدء استخدام \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"مستوى البطارية"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"الإعدادات المشتركة"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"الإعدادات المشتركة"</string>
     <string name="apn_settings" msgid="4295467389400441299">"أسماء نقاط الوصول"</string>
     <string name="apn_edit" msgid="2003683641840248741">"تعديل نقطة الوصول"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"لم يتم الضبط."</string>
@@ -2482,7 +2492,7 @@
     <string name="feature_flags_dashboard_title" msgid="348990373716658289">"عناصر التحكّم في الميزات"</string>
     <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
     <string name="talkback_summary" msgid="5820927220378864281">"هو قارئ شاشة مُصمَّم في الأساس للأشخاص الذين يعانون فقدان البصر أو ضعفه."</string>
-    <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
+    <string name="select_to_speak_summary" msgid="1995285446766920925">"يمكنك النقر على عناصر على شاشتك لتتم قراءتها بصوت عالٍ"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_captioning_about_title" msgid="3542171637334191563">"لمحة عن الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_captioning_footer_learn_more_content_description" msgid="5730040700677017706">"تعرّف على مزيد من المعلومات حول الإعدادات المفضّلة للشرح"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0039bfb..c5253c2 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ফিংগাৰপ্ৰিণ্ট + পিন"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ফিংগাৰপ্ৰিণ্ট + পাছৱৰ্ড"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ফিংগাৰপ্ৰিণ্টৰ অবিহনে অব্যাহত ৰাখক"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"আপুনি আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি আপোনাৰ ফ’নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ প্ৰয়োজন।"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"আপুনি আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি আপোনাৰ ফ’নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ প্ৰয়োজন।"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ফেচ আনলক + আৰ্হি"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ফেচ আনলক + পিন"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ফেচ আনলক + পাছৱৰ্ড"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ফেচ আনলকৰ অবিহনে অব্যাহত ৰাখক"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"আপুনি নিজৰ চেহেৰা ব্যৱহাৰ কৰি আপোনাৰ ফ’নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক বেক আপ স্ক্ৰীন লকৰ প্ৰয়োজন।"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"আপুনি নিজৰ চেহেৰা ব্যৱহাৰ কৰি আপোনাৰ ফ’নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক বেক আপ স্ক্ৰীন লকৰ প্ৰয়োজন।"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"আৰ্হি • মুখাৱয়ব • ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"পিন • মুখাৱয়ব • ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"পাছৱৰ্ড • মুখাৱয়ব • ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ফেচ অথবা ফিংগাৰপ্ৰিণ্টৰ অবিহনে অব্যাহত ৰাখক"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"আপুনি নিজৰ মুখাৱয়ব অথবা ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি নিজৰ ফ’নটো আনলক কৰিব পাৰে। সুৰক্ষাৰ বাবে এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ আৱশ্যক হয়।"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"আপুনি নিজৰ মুখাৱয়ব অথবা ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰি নিজৰ ফ’নটো আনলক কৰিব পাৰে। সুৰক্ষাৰ বাবে এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ আৱশ্যক হয়।"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"নাই"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ছোৱাইপ কৰক"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"আপুনি আপোনাৰ <xliff:g id="NAME">^1</xliff:g> ব্যৱহাৰ কৰা আৰম্ভ কৰিব পাৰে"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"বেটাৰীৰ স্থিতি"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"বেটাৰীৰ পৰিমাণ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"সম্প্ৰদায়ৰ সৈতে জড়িত"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"সম্প্ৰদায়ৰ সৈতে জড়িত ছেটিং"</string>
     <string name="apn_settings" msgid="4295467389400441299">"এপিএনসমূহ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"এক্সেছ পইণ্ট সম্পাদনা কৰক"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ছেট কৰা হোৱা নাই"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index f0ce667..a746178 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Barmaq izi + PIN kod"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Barmaq izi + Parol"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Barmaq izi olmadan davam edin"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün, bu seçim yedək ekran kilidi tələb edir."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün, bu seçim yedək ekran kilidi tələb edir."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Üz ilə kiliddən çıxarma + Model"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Üz ilə kiliddən çıxarma + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Üz ilə kiliddən çıxarma + Parol"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Üz ilə kiliddən çıxarma olmadan davam edin"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Model • Üz • Barmaq izi"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Üz • Barmaq izi"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Parol • Üz • Barmaq izi"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Üz və ya barmaq izi olmadan davam edin"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Üzünüzdən və ya barmaq izinizdən istifadə etməklə telefonunuzu kiliddən çıxara bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Üzünüzdən və ya barmaq izinizdən istifadə etməklə telefonunuzu kiliddən çıxara bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Admin, siyasət və ya yaddaş deaktiv etdi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Heç biri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Sürüşdürmə"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> cihazının istifadəsinə başlaya bilərsiniz"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batareya statusu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Enerji səviyyəsi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Kommunal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Kommunal ayarlar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-lər"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Giriş nöqtəsinə düzəliş edin"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Təyin edilməyib"</string>
@@ -2574,7 +2584,7 @@
     <string name="accessibility_quick_settings_tooltip_dismiss" msgid="3269120277643884190">"Qapadın"</string>
     <string name="accessibility_daltonizer_about_intro_text" product="default" msgid="3636710237139542212">"Telefonunuzda rənglərin necə göstərilməsini tənzimləyin"</string>
     <string name="accessibility_daltonizer_about_intro_text" product="tablet" msgid="3702653229533336133">"Planşetinizdə rənglərin necə göstərilməsini tənzimləyin"</string>
-    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyası istifadə edilsin"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyası işlədilsin"</string>
     <string name="accessibility_daltonizer_shortcut_title" msgid="7480360363995502369">"Rəng korreksiyası qısayolu"</string>
     <string name="accessibility_daltonizer_about_title" msgid="6063650804116981287">"Rəng korreksiyası haqqında"</string>
     <string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Rəng korreksiyası haqqında ətraflı öyrənin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 8ec2041..e609ccb 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -684,7 +684,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, ukloni"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Šifrovanje"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifruj tablet"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifruj telefon"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifrovanje telefona"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Šifrovano"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Podesite zaključavanje ekrana"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Da biste poboljšali bezbednost, podesite PIN, šablon ili lozinku za ovaj uređaj"</string>
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"otisak prsta + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"otisak prsta + lozinka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Nastavite bez otiska prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Možete da otključate telefon pomoću otiska prsta. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Možete da otključate telefon pomoću otiska prsta. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Otključavanje licem i šablon"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Otključavanje licem i PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Otključavanje licem i lozinka"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Nastavite bez otključavanja licem"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Možete da otključate telefon pomoću lica. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Možete da otključate telefon pomoću lica. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Šablon • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Lozinka • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Nastavite bez lica ili otiska prsta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Možete da otključate telefon pomoću lica ili otiska prsta. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Možete da otključate telefon pomoću lica ili otiska prsta. Ova opcija zahteva rezervni način za otključavanje ekrana iz bezbednosnih razloga."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, smernice za šifrovanje ili skladište akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevucite"</string>
@@ -1806,10 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Možete da počnete da koristite: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivo baterije"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Zajedničko"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Zajednička podešavanja"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nazivi pristupnih tačaka"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Izmena pristupne tačke"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nije podešeno"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7bcae0d..f2df9b6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Адбітак пальца + PIN-код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Адбітак пальца + пароль"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Працягнуць без наладжвання адбітка"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Вы можаце разблакіраваць тэлефон адбіткам пальца. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Вы можаце разблакіраваць тэлефон адбіткам пальца. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Распазнаванне твару + узор разблакіроўкі"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Распазнаванне твару + PIN-код"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Распазнаванне твару + пароль"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Працягнуць без распазнавання твару"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання твару. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання твару. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Узор разблакіроўкі • Твар • Адбітак пальца"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-код • Твар • Адбітак пальца"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Пароль • Твар • Адбітак пальца"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Працягнуць без функцыі распазнавання твару ці адбітка пальца"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Вы можаце разблакіраваць тэлефон з дапамогай функцыі распазнавання твару ці адбітка пальца. У мэтах бяспекі для гэтых функцый неабходна наладзіць дадатковы спосаб блакіроўкі."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Вы можаце разблакіраваць тэлефон з дапамогай функцыі распазнавання твару ці адбітка пальца. У мэтах бяспекі для гэтых функцый неабходна наладзіць дадатковы спосаб блакіроўкі."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Адключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых даных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Правядзенне пальцам"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Цяпер вы можаце выкарыстоўваць носьбіт \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Стан батарэі"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Узровень батарэі"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Супольныя"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Супольныя налады"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Змяніць пункт доступу"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не зададзена"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2262bed..bc0b274 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Отпечатък + ПИН код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Отпечатък + парола"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Продължаване без отпечатък"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Можете да отключвате телефона си посредством отпечатъка си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Можете да отключвате телефона си посредством отпечатъка си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Отключване с лице + фигура"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Отключване с лице + ПИН"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Отключване с лице + парола"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Продължаване без отключване с лице"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Можете да отключвате телефона си посредством лицето си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Можете да отключвате телефона си посредством лицето си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Фигура • Лице • Отпечатък"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ПИН • Лице • Отпечатък"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Парола • Лице • Отпечатък"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Продължаване без лице и отпечатък"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Можете да отключвате телефона си посредством лицето или отпечатъка си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Можете да отключвате телефона си посредством лицето или отпечатъка си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"С бързо плъзгане"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Можете да започнете да използвате хранилището си (<xliff:g id="NAME">^1</xliff:g>)"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Ниво на батерията"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Общи"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Общи настройки"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Редакт. на точка за достъп"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не е зададено"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 131e59c..345cf29 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"আঙ্গুলের ছাপ + পিন"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"আঙ্গুলের ছাপ + পাসওয়ার্ড"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"আঙ্গুলের ছাপ ছাড়াই চালিয়ে যান"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করে নিজের ফোন আনলক করতে পারেন। এক্ষেত্রে নিরাপত্তার জন্য, ব্যাক-আপ হিসেবে একটি স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করে নিজের ফোন আনলক করতে পারেন। এক্ষেত্রে নিরাপত্তার জন্য, ব্যাক-আপ হিসেবে একটি স্ক্রিন লকের প্রয়োজন।"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ফেস আনলক + প্যাটার্ন"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ফেস আনলক + পিন"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ফেস আনলক + পাসওয়ার্ড"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"\'ফেস আনলক\' ছাড়াই চালিয়ে যান"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"আপনার ফেস ব্যবহার করে আপনি ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"আপনার ফেস ব্যবহার করে আপনি ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"প্যাটার্ন • মুখ • আঙ্গুলের ছাপ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"পিন • মুখ • আঙ্গুলের ছাপ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"পাসওয়ার্ড • মুখ • আঙ্গুলের ছাপ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"মুখ এবং আঙুলের ছাপ ছাড়া চালিয়ে যান"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"আপনার মুখ বা আঙুলের ছাপ ব্যবহার করে ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"আপনার মুখ বা আঙুলের ছাপ ব্যবহার করে ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল স্টোরেজ দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"কোনও কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"সোয়াইপ করুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6f339b4..c82db91 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Otisak prsta i PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Otisak prsta i lozinka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Nastavi bez postavljanja otiska prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Otključavanje licem + uzorak"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Otključavanje licem + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Otključavanje licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Nastavite s otključavanjem licem"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Uzorak • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Lozinka • Lice • Otisak prsta"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Nastavite bez otključavanja licem ili otiskom prsta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Možete otključati telefon licem ili otiskom prsta. Iz sigurnosnih razloga ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Možete otključati telefon licem ili otiskom prsta. Iz sigurnosnih razloga ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevlačenje prstom"</string>
@@ -1806,8 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Možete početi koristiti medij <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivo napunjenosti baterije"</string>
-    <string name="communal_settings_title" msgid="2845678473945902115">"Zajedničko"</string>
-    <string name="communal_settings_summary" msgid="4923914136953940317">"Zajedničke postavke"</string>
+    <string name="communal_settings_title" msgid="2845678473945902115">"Opće"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Opće postavke"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ovi"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Uredi pristupnu tačku"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nije postavljeno"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7853032..07562ce 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Empremta digital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Empremta digital + contrasenya"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continua sense l\'empremta digital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Pots desbloquejar el telèfon amb l\'empremta digital. Per motius de seguretat, per utilitzar aquesta opció cal un bloqueig de pantalla alternatiu."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Pots desbloquejar el telèfon amb l\'empremta digital. Per motius de seguretat, per utilitzar aquesta opció cal un bloqueig de pantalla alternatiu."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueig facial + patró"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueig facial + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueig facial + contrasenya"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continua sense Desbloqueig facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Pots desbloquejar el telèfon amb l\'autenticació facial. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Pots desbloquejar el telèfon amb l\'autenticació facial. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Patró • Cara • Empremta digital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Cara • Empremta digital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Contrasenya • Cara • Empremta digital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continua sense cara ni empremta digital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Pots desbloquejar el telèfon utilitzant la teva cara o empremta digital. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Pots desbloquejar el telèfon utilitzant la teva cara o empremta digital. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desact. per l\'admin., política d\'encrip. o emmagat. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Llisca"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Pots començar a utilitzar la teva <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivell de la bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comuna"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configuració comuna"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edita el punt d\'accés"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"No definit"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b2e4a4b..314cf66 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Otisk prstu a PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Otisk prstu a heslo"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Pokračovat bez otisku prstu"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Zařízení můžete odemknout otiskem prstu. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Zařízení můžete odemknout otiskem prstu. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Odemknutí obličejem + gesto"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Odemknutí obličejem + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Odemknutí obličejem + heslo"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Pokračovat bez odemknutí obličejem"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Zařízení můžete odemknout pomocí obličeje. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Zařízení můžete odemknout pomocí obličeje. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Gesto • obličej • otisk prstu"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • obličej • otisk prstu"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Heslo • obličej • otisk prstu"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Pokračovat bez obličeje nebo otisku prstu"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefon můžete odemykat pomocí obličeje nebo otisku prstu. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefon můžete odemykat pomocí obličeje nebo otisku prstu. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázáno administrátorem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Bez zabezpečení"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Přejetí prstem"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Můžete začít používat úložiště <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stav baterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nabití baterie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Komunální"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Komunální nastavení"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Přístupové body"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Upravit přístupový bod"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenastaveno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f351ea8..81d5d5f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -556,7 +556,7 @@
     <string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="5857063580604638331">"Fingeraftrykssensoren sidder på afbryderknappen. Det er den flade knap ud for den hævede lydstyrkeknap på telefonens kant.\n\nNår du trykker på afbryderknappen, slukkes skærmen."</string>
     <string name="security_settings_udfps_enroll_find_sensor_message" msgid="8383106460819519961">"Fingeraftrykssensoren er på din skærm. Du registrerer dit fingeraftryk på den næste skærm."</string>
     <string name="security_settings_udfps_enroll_find_sensor_start_button" msgid="3172268783620336357">"Start"</string>
-    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Bevæg fingeren hen over skærmen for at finde sensoren. Hold fingeren nede på fingeraftrykslæseren."</string>
+    <string name="security_settings_udfps_enroll_a11y" msgid="1899453114050362235">"Bevæg fingeren hen over skærmen for at finde sensoren. Hold fingeren på fingeraftrykslæseren."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enhed og lokation af fingeraftrykslæser"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
@@ -566,7 +566,7 @@
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
     <string name="security_settings_udfps_enroll_start_message" msgid="5032954588171487566">"Tryk fingeren helt ned på sensoren, indtil du mærker en vibration"</string>
     <string name="security_settings_sfps_enroll_start_message" msgid="9054672627477685212">"Uden at trykke på knappen skal du holde dit fingeraftryk på sensoren, indtil du mærker en vibration.\n\nFlyt din finger en smule, hver gang du mærker en vibration. På den måde registreres en større del af dit fingeraftryk."</string>
-    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Hold fingeren nede på fingeraftrykssensoren"</string>
+    <string name="security_settings_fingerprint_enroll_udfps_title" msgid="6665610134560896895">"Hold fingeren på fingeraftrykssensoren"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Løft, og tryk igen"</string>
     <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"Én gang til"</string>
     <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="4096344864386190335">"Følg fingeraftryksikonet"</string>
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingeraftryk og pinkode"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingeraftryk og adgangskode"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Fortsæt uden fingeraftryk"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Du kan låse telefonen op ved hjælp af dit fingeraftryk. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Du kan låse telefonen op ved hjælp af dit fingeraftryk. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ansigtslås og mønster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ansigtslås og pinkode"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ansigtslås og adgangskode"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Fortsæt uden ansigtslås"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse din telefonen op ved hjælp af dit ansigt. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Du kan låse din telefonen op ved hjælp af dit ansigt. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mønster • Ansigt • Fingeraftryk"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Pinkode • Ansigt • Fingeraftryk"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Adgangskode • Ansigt • Fingeraftryk"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Fortsæt uden ansigtslås eller fingeraftryk"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Du kan låse din telefon op ved hjælp af dit ansigt eller fingeraftryk. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Du kan låse din telefon op ved hjælp af dit ansigt eller fingeraftryk. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Deaktiveret af administrator, krypteringspolitik eller Lager for loginoplysninger"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Stryg"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan nu bruge dit <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batteriniveau"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Fælles"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Fælles indstillinger"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Adgangspunkter"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediger adgangspunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ikke angivet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index adeaafb..f2678ef 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerabdruck + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerabdruck + Passwort"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Weiter ohne Fingerabdruck"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Du kannst dein Smartphone mit deinem Fingerabdruck entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Du kannst dein Smartphone mit deinem Fingerabdruck entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Entsperrung per Gesichtserkennung + Muster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Entsperrung per Gesichtserkennung + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Entsperrung per Gesichtserkennung + Passwort"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Ohne Entsperrung per Gesichtserkennung fortfahren"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Du kannst dein Smartphone über die Gesichtserkennung entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Du kannst dein Smartphone über die Gesichtserkennung entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Muster • Gesicht • Fingerabdruck"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Gesicht • Fingerabdruck"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Passwort • Gesicht • Fingerabdruck"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Ohne Gesicht oder Fingerabdruck fortfahren"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Du kannst dein Smartphone mit deinem Gesicht oder Fingerabdruck entsperren. Aus Sicherheitsgründen ist bei dieser Option eine alternative Displaysperre erforderlich."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Du kannst dein Smartphone mit deinem Gesicht oder Fingerabdruck entsperren. Aus Sicherheitsgründen ist bei dieser Option eine alternative Displaysperre erforderlich."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Durch Administrator, Richtlinie oder Anmeldedatenspeicher deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Wischen"</string>
@@ -1786,10 +1798,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Deine <xliff:g id="NAME">^1</xliff:g> ist jetzt einsatzbereit"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akkustatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akkustand"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeinschaftlich"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeinschaftliche Einstellungen"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Zugangspunkt bearbeiten"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nicht definiert"</string>
@@ -2455,7 +2465,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Wenn du eine Bedienungshilfe verwenden möchtest, wische vom unteren Displayrand mit zwei Fingern nach oben.\n\nWenn du zwischen den Funktionen wechseln möchtest, wische mit zwei Fingern über das Display nach oben und halte."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Wenn du eine Bedienungshilfe verwenden möchtest, wische vom unteren Displayrand mit drei Fingern nach oben.\n\nWenn du zwischen den Funktionen wechseln möchtest, wische mit drei Fingern über das Display nach oben und halte."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Verknüpfung für „<xliff:g id="SERVICE">%1$s</xliff:g>“"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Kurzbefehl für „<xliff:g id="SERVICE">%1$s</xliff:g>“"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Schaltfläche „Bedienungshilfen“"</string>
     <string name="accessibility_shortcut_edit_summary_software_gesture" msgid="5489284264414421286">"Touch-Geste für Bedienungshilfen"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Mit zwei Fingern nach oben wischen"</string>
@@ -2688,7 +2698,7 @@
     <string name="color_cyan" msgid="4341758639597035927">"Blaugrün"</string>
     <string name="color_yellow" msgid="5957551912912679058">"Gelb"</string>
     <string name="color_magenta" msgid="8943538189219528423">"Magenta"</string>
-    <string name="enable_service_title" msgid="7231533866953706788">"<xliff:g id="SERVICE">%1$s</xliff:g> die vollständige Kontrolle über dein Gerät geben?"</string>
+    <string name="enable_service_title" msgid="7231533866953706788">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ die vollständige Kontrolle über dein Gerät geben?"</string>
     <string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
     <string name="touch_filtered_warning" msgid="4225815157460318241">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
     <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> fordert eine volle Kontrolle für dieses Gerät an. Der Dienst kann den Bildschirm lesen und im Namen von Nutzern mit Bedarf an Bedienungshilfen handeln. Dieses Maß an Kontrolle ist für die meisten Apps ungeeignet."</string>
@@ -5666,7 +5676,7 @@
     <string name="power_menu_long_press_for_assist_sensitivity_summary" msgid="7550610071666801935">"Stelle die Empfindlichkeit ein, indem du festlegst, wie lange du die Ein-/Aus-Taste gedrückt halten musst"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_low_label" msgid="3430099983480845635">"Kurz"</string>
     <string name="power_menu_long_press_for_assist_sensitivity_high_label" msgid="2059686170350829156">"Lang"</string>
-    <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Geldbörse anzeigen"</string>
+    <string name="lockscreen_privacy_wallet_setting_toggle" msgid="4188327143734192000">"Wallet anzeigen"</string>
     <string name="lockscreen_privacy_wallet_summary" msgid="3984851951621168573">"Erlaubt den Zugriff auf Wallet auch im Sperrbildschirm."</string>
     <string name="lockscreen_privacy_qr_code_scanner_setting_toggle" msgid="4284186474146767523">"QR-Scanner anzeigen"</string>
     <string name="lockscreen_privacy_qr_code_scanner_summary" msgid="6152471629901191089">"Zugriff auf QR-Scanner vom Sperrbildschirm aus zulassen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 93db4b7..7eb9c68 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Δακτυλικό αποτύπωμα + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Δακτυλικό αποτύπωμα + Κωδικός πρόσβασης"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Συνέχεια χωρίς δακτυλικό αποτύπωμα"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το δακτυλικό σας αποτύπωμα. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το δακτυλικό σας αποτύπωμα. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ξεκλείδωμα με το πρόσωπο + Μοτίβο"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ξεκλείδωμα με το πρόσωπο + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ξεκλείδωμα με το πρόσωπο + Κωδικός πρόσβασης"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Συνέχεια χωρίς Ξεκλείδωμα με το πρόσωπο"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπό σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπό σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Μοτίβο • Πρόσωπο • Δακτυλικό αποτύπωμα"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Πρόσωπο • Δακτυλικό αποτύπωμα"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Κωδικός πρόσβασης • Πρόσωπο • Δακτ. αποτύπωμα"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Συνεχίστε χωρίς πρόσωπο ή δακτυλικό αποτύπωμα"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπο ή το δακτυλικό αποτύπωμά σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπο ή το δακτυλικό αποτύπωμά σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Ολίσθηση"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0804613..d8c5e17 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerprint + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continue without fingerprint"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Face Unlock + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue without Face Unlock"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Face • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continue without face or fingerprint"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -2438,7 +2450,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 982c7f8..74d6cf9 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerprint + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continue without fingerprint"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + Pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Face Unlock + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + Password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue without Face Unlock"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Face • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continue without face or fingerprint"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy, or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c451e10..8df5bc6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerprint + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continue without fingerprint"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Face Unlock + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue without Face Unlock"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Face • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continue without face or fingerprint"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -2438,7 +2450,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3e5af2c..b78bfbe 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerprint + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continue without fingerprint"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Face Unlock + pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Face Unlock + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Face Unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue without Face Unlock"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Face • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Face • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continue without face or fingerprint"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -2438,7 +2450,7 @@
     <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"&lt;b&gt;To zoom in:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Use shortcut to start magnification&lt;br/&gt; {1,number,integer}. Tap the screen&lt;br/&gt; {2,number,integer}. Drag two fingers to move around screen&lt;br/&gt; {3,number,integer}. Pinch with two fingers to adjust zoom&lt;br/&gt; {4,number,integer}. Use shortcut to stop magnification&lt;br/&gt;&lt;br/&gt; &lt;b&gt;To zoom in temporarily:&lt;/b&gt;&lt;br/&gt; {0,number,integer}. Make sure that your magnification type is set to full screen&lt;br/&gt; {1,number,integer}. Use shortcut to start magnification&lt;br/&gt; {2,number,integer}. Touch and hold anywhere on the screen&lt;br/&gt; {3,number,integer}. Drag finger to move around screen&lt;br/&gt; {4,number,integer}. Lift finger to stop magnification"</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use accessibility button to open"</string>
+    <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Use Accessibility button to open"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Hold volume keys to open"</string>
     <string name="accessibility_tutorial_dialog_title_triple" msgid="7089562919284464400">"Triple-tap screen to open"</string>
     <string name="accessibility_tutorial_dialog_title_gesture" msgid="4965810097646659332">"Use gesture to open"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index febf687..d1d15bc 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎Fingerprint + PIN‎‏‎‎‏‎"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎Fingerprint + Password‎‏‎‎‏‎"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎Continue without fingerprint‎‏‎‎‏‎"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎Face Unlock + Pattern‎‏‎‎‏‎"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎Face Unlock + PIN‎‏‎‎‏‎"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎Face Unlock + Password‎‏‎‎‏‎"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎Continue without Face Unlock‎‏‎‎‏‎"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎You can unlock your phone using your face. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎You can unlock your phone using your face. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎Pattern • Face • Fingerprint‎‏‎‎‏‎"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎PIN • Face • Fingerprint‎‏‎‎‏‎"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎Password • Face • Fingerprint‎‏‎‎‏‎"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‎Continue without face or fingerprint‎‏‎‎‏‎"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎Disabled by admin, encryption policy, or credential storage‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎None‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎Swipe‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 77d17ef..8e8005d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Huella dactilar y PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Huella dactilar y contraseña"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sin huella dactilar"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella dactilar. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella dactilar. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueo facial y patrón"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueo facial y PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueo facial y contraseña"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuar sin Desbloqueo facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear tu teléfono con el reconocimiento facial. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Puedes desbloquear tu teléfono con el reconocimiento facial. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Patrón • Desbloqueo facial • Huella dactilar"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Desbloqueo facial • Huella dactilar"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Contraseña • Desbl. facial • Huella dactilar"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sin el desbloqueo facial ni la huella dactilar"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Puedes desbloquear el teléfono con el rostro o con tu huella dactilar. Por razones de seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Puedes desbloquear el teléfono con el rostro o con tu huella dactilar. Por razones de seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada: admin, encriptación o credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1096,7 +1108,7 @@
     <string name="passpoint_content" msgid="5219226173518418335">"Credenciales de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"Método EAP"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Autenticación de fase 2"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado de CA"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificado de la AC"</string>
     <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Estado de certificado en línea"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Certificado del usuario"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Para comenzar, puedes usar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado de batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de la batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comunal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configuración comunal"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sin establecer"</string>
@@ -3143,7 +3153,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"Borrar credenciales"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Quitar todos los certificados"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Credenciales de confianza"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"Mostrar certificados de CA de confianza"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"Mostrar certificados de la AC de confianza"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
@@ -3154,7 +3164,7 @@
     <string name="credentials_erased" msgid="9121052044566053345">"Credenciales borradas"</string>
     <string name="credentials_not_erased" msgid="3611058412683184031">"Imposible borrar almac credenc"</string>
     <string name="usage_access_title" msgid="1580006124578134850">"Acceso a datos de uso"</string>
-    <string name="ca_certificate" msgid="3076484307693855611">"Certificado de CA"</string>
+    <string name="ca_certificate" msgid="3076484307693855611">"Certificado de la AC"</string>
     <string name="user_certificate" msgid="6897024598058566466">"Cert. de usuario de app y VPN"</string>
     <string name="wifi_certificate" msgid="8461905432409380387">"Certificado de Wi‑Fi"</string>
     <string name="ca_certificate_warning_title" msgid="7951148441028692619">"Tus datos no serán privados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 69a4085..aafecdf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Huella digital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Huella digital + contraseña"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sin huella digital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella digital. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella digital. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueo facial + patrón"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueo facial + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueo facial + contraseña"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuar sin Desbloqueo facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear el teléfono con tu cara. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Puedes desbloquear el teléfono con tu cara. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Patrón • Cara • Huella digital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Cara • Huella digital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Contraseña • Cara • Huella digital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sin cara ni huella digital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Puedes desbloquear el teléfono con la cara o con una huella digital. Por motivos de seguridad, necesitas un método de bloqueo de pantalla alternativo para utilizar esta opción."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Puedes desbloquear el teléfono con la cara o con una huella digital. Por motivos de seguridad, necesitas un método de bloqueo de pantalla alternativo para utilizar esta opción."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada por admin., política cifrado o almac. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Ya puedes empezar a usar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comunes"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ajustes comunes"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sin establecer"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b9250b6..5de95ea 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Sõrmejälg + PIN-kood"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Sõrmejälg + parool"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Jätkamine ilma sõrmejäljeta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefoni saate avada oma sõrmejäljega. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefoni saate avada oma sõrmejäljega. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Näoga avamine + muster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Näoga avamine + PIN-kood"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Näoga avamine + parool"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Jätka ilma näoga avamiseta"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefoni võite avada oma näoga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefoni võite avada oma näoga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Muster • Nägu • Sõrmejälg"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-kood • Nägu • Sõrmejälg"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Parool • Nägu • Sõrmejälg"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Jätka ilma näo või sõrmejäljeta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Saate oma telefoni avada näo või sõrmejäljega. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Saate oma telefoni avada näo või sõrmejäljega. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administraator, krüpteerimiseeskirjad või mandaatide salvestusruum on selle keelanud"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pühkimine"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> on kasutamiseks valmis"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Aku olek"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Aku tase"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ühised"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ühised seaded"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Pääsupunktid (APN-id)"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Pääsupunkti muutmine"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Määramata"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0da7d65..1f975cd 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Hatz-marka + PINa"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Hatz-marka digitala + pasahitza"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Egin aurrera hatz-markarik gabe"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Hatz-marka erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Hatz-marka erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Aurpegi bidez desblokeatzeko eginbidea + eredua"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Aurpegi bidez desblokeatzeko eginbidea + PINa"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Aurpegi bidez desblokeatzeko eginbidea + pasahitza"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Egin aurrera aurpegi bidez desblokeatzeko eginbidea gabe"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Aurpegia erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Aurpegia erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Eredua • Aurpegia • Hatz-marka"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PINa • Aurpegia • Hatz-marka"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Pasahitza • Aurpegia • Hatz-marka"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Egin aurrera aurpegirik edo hatz-markarik gabe"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Aurpegia edo hatz-marka erabilita desblokea dezakezu telefonoa. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Aurpegia edo hatz-marka erabilita desblokea dezakezu telefonoa. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administratzaileak, enkriptatze-gidalerroek edo kredentzialen biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hatza pasatzea"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> erabiltzen has zaitezke"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Bateria-maila"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Komunak"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ezarpen komunak"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNak"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editatu sarbide-puntua"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ezarri gabe"</string>
@@ -3018,7 +3028,7 @@
     <string name="battery_usage_without_time" msgid="1346894834339420538"></string>
     <string name="battery_usage_other_users" msgid="9002643295562500693">"Beste erabiltzaileak"</string>
     <string name="advanced_battery_graph_subtext" msgid="6816737986172678550">"Gailuaren erabileran oinarritzen da gelditzen den bateriaren estimazioa"</string>
-    <string name="estimated_time_left" msgid="948717045180211777">"Geratzen den denbora, gutxi gorabehera"</string>
+    <string name="estimated_time_left" msgid="948717045180211777">"Geratzen den denbora estimatua"</string>
     <string name="estimated_charging_time_left" msgid="2287135413363961246">"guztiz kargatu arte"</string>
     <string name="estimated_time_description" msgid="211058785418596009">"Estimazioak gorabeherak izan ditzake erabileraren arabera"</string>
     <string name="menu_stats_unplugged" msgid="7125297366200634285">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> entxufea atera zenetik"</string>
@@ -3111,7 +3121,7 @@
     <string name="voice_input_settings_title" msgid="3708147270767296322">"Ahozko idazketa"</string>
     <string name="voice_service_preference_section_title" msgid="4807795449147187497">"Ahozko idazketa-zerbitzuak"</string>
     <string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Ahozko gako-hitzak eta erabateko interakzioa"</string>
-    <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Ahoz idazteko eginbide arrunta"</string>
+    <string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Ahotsa testu bihurtzeko eginbide sinplea"</string>
     <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Aginduak ahoz emateko zerbitzu honek une oro kontrolatuko du ahotsa eta ahozko gaitasuna duten aplikazioak ere kontrolatu ahal izango ditu. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikazioarena da. Zerbitzu hau erabiltzeko aukera gaitu nahi duzu?"</string>
     <string name="on_device_recognition_settings" msgid="6503160369314598069">"Gailuko hautemate-ezarpenak"</string>
     <string name="on_device_recognition_settings_title" msgid="7137599722039096545">"Gailuko hautematea"</string>
@@ -3143,7 +3153,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"Garbitu kredentzialak"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Kendu ziurtagiri guztiak"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Kredentzial fidagarriak"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"Bistaratu CA fidagarrien ziurtagiriak"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"Bistaratu autoritate ziurtagiri-emaile fidagarri batek jaulkitako ziurtagiriak"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
@@ -3295,8 +3305,8 @@
     <string name="data_usage_menu_split_4g" msgid="3391899816926640583">"4G erabilera bereizia"</string>
     <string name="data_usage_menu_show_wifi" msgid="6380926350184939975">"Erakutsi Wi‑Fi sareen erabilera"</string>
     <string name="data_usage_menu_hide_wifi" msgid="4694889089278302691">"Ezkutatu Wi‑Fi erabilera"</string>
-    <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"Erakuts Ethernet erabilera"</string>
-    <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"Ezkutatu Ethernet erabilera"</string>
+    <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"Erakutsi Ethernet-erabilera"</string>
+    <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"Ezkutatu Ethernet-erabilera"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"Sarearen murriztapenak"</string>
     <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"Sinkronizatu datuak automatikoki"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"SIM txartelak"</string>
@@ -4853,7 +4863,7 @@
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioak erabilitako datuak"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-sareko datu-erabilera"</string>
     <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datuen erabilera"</string>
-    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datu-erabilera"</string>
+    <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-datuen erabilera"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifia"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
     <string name="cell_data_template" msgid="6077963976103260821">"Datu-konexioaren <xliff:g id="AMOUNT">^1</xliff:g>"</string>
@@ -5150,7 +5160,7 @@
     <string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Azken segurtasun-erregistroa"</string>
     <string name="enterprise_privacy_none" msgid="6026527690979756431">"Bat ere ez"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Instalatutako aplikazioak"</string>
-    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Gutxi gorabeherakoa da aplikazio kopurua. Baliteke Play Store-tik instalatu ez diren aplikazioak kontuan ez izatea."</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Aplikazio kopurua estimazio bat da. Baliteke Play Store-tik instalatu ez diren aplikazioak kontuan ez izatea."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="other">Gutxienez <xliff:g id="COUNT_1">%d</xliff:g> aplikazio</item>
       <item quantity="one">Gutxienez <xliff:g id="COUNT_0">%d</xliff:g> aplikazio</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cfe060a..15e58a0 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -330,15 +330,15 @@
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"درباره «تنظیمات مکان» بیشتر بدانید."</string>
     <string name="account_settings_title" msgid="9138880127246241885">"حساب‌ها"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"امنیت"</string>
-    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"رمزگذاری و اطلاعات کاربری"</string>
+    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"رمزگذاری و اطلاعات اعتباری"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"تلفن رمزگذاری شده است"</string>
     <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"تلفن رمزگذاری‌ نشده است"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"دستگاه رمزگذاری شد"</string>
     <string name="not_encrypted_summary" product="tablet" msgid="2374263654698719382">"دستگاه رمزگذاری نشده است"</string>
     <string name="lockscreen_settings_title" msgid="4086121748092341549">"صفحه قفل"</string>
     <string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"چه چیزی نشان داده شود"</string>
-    <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
-    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
+    <string name="security_settings_summary" msgid="1627059516127354233">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل فضای ذخیره‌سازی اطلاعات اعتباری"</string>
+    <string name="cdma_security_settings_summary" msgid="2455517905101186330">"تنظیم مکان من، بازگشایی قفل صفحه، قفل فضای ذخیره‌سازی اطلاعات اعتباری"</string>
     <string name="security_passwords_title" msgid="4154420930973818581">"حریم خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"در دسترس نیست"</string>
     <string name="security_status_title" msgid="6958004275337618656">"وضعیت امنیتی"</string>
@@ -660,7 +660,7 @@
     <string name="security_settings_fingerprint_bad_calibration" msgid="598502302101068608">"امکان استفاده از حسگر اثر انگشت وجود ندارد. به ارائه‌دهنده خدمات تعمیر مراجعه کنید"</string>
     <string name="security_advanced_settings" msgid="6260756619837834042">"تنظیمات امنیتی بیشتر"</string>
     <string name="security_advanced_settings_work_profile_settings_summary" msgid="7295451997961973175">"قفل نمایه کاری، رمزگذاری، و غیره"</string>
-    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"رمزگذاری، اطلاعات کاربری، و غیره"</string>
+    <string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"رمزگذاری، اطلاعات اعتباری، و غیره"</string>
     <string name="security_advanced_settings_keywords" msgid="5294945170370974974">"امنیت، تنظیمات امنیتی بیشتر، تنظیمات بیشتر، تنظیمات امنیتی پیشرفته"</string>
     <string name="privacy_advanced_settings" msgid="8828215456566937719">"تنظیمات حریم خصوصی بیشتر"</string>
     <string name="privacy_advanced_settings_summary" msgid="2927281894237561935">"تکمیل خودکار، کنترل‌های فعالیت، و غیره"</string>
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"اثر انگشت + پین"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"اثر انگشت + گذرواژه"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ادامه بدون اثر انگشت"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"می‌توانید با استفاده از اثر انگشتتان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"می‌توانید با استفاده از اثر انگشتتان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"قفل‌گشایی با چهره + الگو"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"قفل‌گشایی با چهره + پین"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"قفل‌گشایی با چهره + گذرواژه"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ادامه بدون «قفل‌گشایی با چهره»"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"می‌توانید با استفاده از چهره‌تان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"می‌توانید با استفاده از چهره‌تان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"الگو • چهره • اثر انگشت"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"پین • چهره • اثر انگشت"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"گذرواژه • چهره • اثر انگشت"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ادامه دادن بدون تشخیص چهره یا اثر انگشت"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"می‌توانید بااستفاده از چهره یا اثر انگشت، قفل تلفنتان را باز کنید. بنا به دلایل امنیتی، افزودن قفل صفحه پشتیبان برای این گزینه الزامی است."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"می‌توانید بااستفاده از چهره یا اثر انگشت، قفل تلفنتان را باز کنید. بنا به دلایل امنیتی، افزودن قفل صفحه پشتیبان برای این گزینه الزامی است."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"توسط سرپرست غیرفعال شده، طبق خط‌مشی رمزگذاری یا حافظه اطلاعات کاربردی"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"خالی"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"تند کشیدن"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"می‌توانید شروع به استفاده از <xliff:g id="NAME">^1</xliff:g> کنید"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"مقدار شارژ باتری"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"عمومی"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"تنظیمات عمومی"</string>
     <string name="apn_settings" msgid="4295467389400441299">"نام‌های نقاط دستیابی"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ویرایش نقطه دستیابی"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"تنظیم نشده است"</string>
@@ -3136,23 +3146,23 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"با مدیریت خودکار اتصال‌های شبکه، عمر باتری را افزایش می‌دهد و عملکرد دستگاه را بهبود می‌بخشد"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"روشن"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"خاموش"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"حافظه اطلاعات کاربری"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"فضای ذخیره‌سازی اطلاعات اعتباری"</string>
     <string name="credentials_install" msgid="3933218407598415827">"نصب گواهینامه"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از حافظه"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از فضای ذخیره‌سازی"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"‏نصب گواهی‌ها از کارت SD"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"پاک کردن اطلاعات کاربری"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"پاک کردن اطلاعات اعتباری"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"حذف تمام گواهی‌ها"</string>
-    <string name="trusted_credentials" msgid="2522784976058244683">"اطلاعات کاربری مطمئن"</string>
+    <string name="trusted_credentials" msgid="2522784976058244683">"اطلاعات اعتباری مطمئن"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"‏نمایش گواهی‌های CA مطمئن"</string>
-    <string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
-    <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیره‌شده"</string>
+    <string name="user_credentials" msgid="4044405430790970775">"اطلاعات اعتباری کاربر"</string>
+    <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات اعتباری ذخیره‌شده"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏نصب‌شده برای VPN و برنامه‌ها"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏نصب‌شده برای Wi-Fi"</string>
     <string name="credentials_reset_hint" msgid="4054601857203464867">"همه محتوا حذف شود؟"</string>
-    <string name="credentials_erased" msgid="9121052044566053345">"حافظه اطلاعات کاربری پاک شد."</string>
-    <string name="credentials_not_erased" msgid="3611058412683184031">"حافظه اطلاعات کاربری پاک نمی‌شود."</string>
+    <string name="credentials_erased" msgid="9121052044566053345">"فضای ذخیره‌سازی اطلاعات اعتباری پاک شد."</string>
+    <string name="credentials_not_erased" msgid="3611058412683184031">"فضای ذخیره‌سازی اطلاعات اعتباری پاک نمی‌شود."</string>
     <string name="usage_access_title" msgid="1580006124578134850">"برنامه‌های مجاز به دسترسی به داده‌های مصرف"</string>
     <string name="ca_certificate" msgid="3076484307693855611">"گواهینامه مرکز صدور گواهی"</string>
     <string name="user_certificate" msgid="6897024598058566466">"‏گواهینامه کاربر برنامه و VPN"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e5e76d3..9d37d71 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Sormenjälki ja PIN-koodi"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Sormenjälki ja salasana"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Jatka ilman sormenjälkeä"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Voit avata puhelimen lukituksen käyttämällä sormenjälkeäsi. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Voit avata puhelimen lukituksen käyttämällä sormenjälkeäsi. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Kasvojentunnistusavaus ja kuvio"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Kasvojentunnistusavaus ja PIN-koodi"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Kasvojentunnistusavaus ja salasana"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Jatka ilman kasvojentunnistusavausta"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Voit avata puhelimen lukituksen kasvojentunnistuksella. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Voit avata puhelimen lukituksen kasvojentunnistuksella. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Kuvio • Kasvot • Sormenjälki"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-koodi • Kasvot • Sormenjälki"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Salasana • Kasvot • Sormenjälki"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Jatka käyttämättä kasvoja tai sormenjälkeä"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Voit avata puhelimen lukituksen kasvoillasi tai sormenjäljelläsi. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Voit avata puhelimen lukituksen kasvoillasi tai sormenjäljelläsi. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Järj.valvojan, salauskäyt. tai tunnuksien tall.tilan estämä"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pyyhkäisy"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> on nyt käytettävissä"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akun tila"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akun taso"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Yhteiskäyttö"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Yhteiskäytön asetukset"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN:t"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Muokkaa tukiasemaa"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ei asetettu"</string>
@@ -2108,7 +2118,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Sama kuin laitteen näytön lukitus"</string>
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"Hallinnoi ja poista asennettuja sovelluksia"</string>
-    <string name="applications_settings" msgid="1941993743933425622">"Sovelluksen tiedot"</string>
+    <string name="applications_settings" msgid="1941993743933425622">"Sovellustiedot"</string>
     <string name="applications_settings_summary" msgid="8206066893744768531">"Hallinnoi sovelluksia, ota käyttöön pikakuvakkeita"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"Sovellusasetukset"</string>
     <string name="install_applications" msgid="3921609656584369901">"Tuntemattomat lähteet"</string>
@@ -2125,7 +2135,7 @@
     <string name="install_all_warning" product="device" msgid="2348262609815354500">"Tuntemattomista lähteistä tulevat sovellukset voivat helpommin kaapata laitteesi ja henkilötietosi. Lataamalla sovelluksia tästä lähteestä hyväksyt, että olet itse vastuussa laitteellesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua sovellusten käytöstä."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Lisäasetukset"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Ota lisää asetuksia käyttöön."</string>
-    <string name="application_info_label" msgid="1015706497694165866">"Sovelluksen tiedot"</string>
+    <string name="application_info_label" msgid="1015706497694165866">"Sovellustiedot"</string>
     <string name="storage_label" msgid="2522307545547515733">"Tallennustila"</string>
     <string name="auto_launch_label" msgid="4069860409309364872">"Avaa oletuksena"</string>
     <string name="auto_launch_label_generic" msgid="5033137408273064599">"Oletukset"</string>
@@ -2178,7 +2188,7 @@
     <string name="filter" msgid="9039576690686251462">"Suodata"</string>
     <string name="filter_dlg_title" msgid="3086282431958601338">"Valitse suodatinvaihtoehdot"</string>
     <string name="filter_apps_all" msgid="5705421199299914620">"Kaikki sovellukset"</string>
-    <string name="filter_apps_disabled" msgid="5068011814871004105">"Käytöstä poistetut sovellukset"</string>
+    <string name="filter_apps_disabled" msgid="5068011814871004105">"Käytöstä poistetut"</string>
     <string name="filter_apps_third_party" msgid="9049447784849114843">"Ladattu"</string>
     <string name="filter_apps_running" msgid="535465683273284141">"Käynnissä"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="5140211657134608469">"USB-tallennustila"</string>
@@ -2953,7 +2963,7 @@
     <string name="usage_type_computed_power" msgid="5191902025833668752">"Laskettu virrankäyttö"</string>
     <string name="usage_type_actual_power" msgid="1221358930299037926">"Havaittu virrankäyttö"</string>
     <string name="battery_action_stop" msgid="6998228610098034316">"Pakota lopetus"</string>
-    <string name="battery_action_app_details" msgid="7201369216798227707">"Sovelluksen tiedot"</string>
+    <string name="battery_action_app_details" msgid="7201369216798227707">"Sovellustiedot"</string>
     <string name="battery_action_app_settings" msgid="2437124469335488464">"Sovellusasetukset"</string>
     <string name="battery_action_display" msgid="6515712081248863749">"Ruudun asetukset"</string>
     <string name="battery_action_wifi" msgid="1829212604573932607">"Wi-Fi-asetukset"</string>
@@ -4366,7 +4376,7 @@
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Kukaan ei voi keskeyttää"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Jotkut voivat keskeyttää"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Kaikki käyttäjät voivat keskeyttää"</string>
-    <string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Usein soittavat"</string>
+    <string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Toistuvasti soittavat"</string>
     <string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Salli usein soittavat"</string>
     <string name="zen_mode_all_callers" msgid="8104755389401941875">"kuka tahansa"</string>
     <string name="zen_mode_contacts_callers" msgid="5429267704011896833">"yhteyshenkilöt"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 642f149..3605bda 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Empreinte digitale + NIP"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Empreinte digitale + mot de passe"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuer sans empreintes digitales"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Vous pouvez déverrouiller votre téléphone avec votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Vous pouvez déverrouiller votre téléphone avec votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Déverr. par  reconnaissance faciale + schéma"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Déverr. par reconnaissance faciale + NIP"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Déverr. par reconnaissance faciale + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuer sans configurer déverr. par reconnaissance faciale"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone avec votre visage. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone avec votre visage. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Schéma • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"NIP • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Mot de passe • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuer sans reconnaissance faciale ni empreinte digitale"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Vous pouvez déverrouiller votre téléphone avec votre visage ou votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Vous pouvez déverrouiller votre téléphone avec votre visage ou votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par admin., politique cryptage, stock. authentifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayer l\'écran"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Vous pouvez commencer à utiliser votre <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"État de la batterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveau de la pile"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Commun"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Paramètres communs"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Noms des points d\'accès"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Non défini"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 62a4f25..893cdc1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Empreinte digitale + code"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Empreinte digitale + mot de passe"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuer sans empreinte digitale"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Pour plus de sécurité, cette option doit être associée à un autre mode de verrouillage de l\'écran."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre empreinte digitale. Pour plus de sécurité, cette option doit être associée à un autre mode de verrouillage de l\'écran."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Déverrouillage par reco. faciale + schéma"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Déverrouillage par reco. faciale + code"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Déver. par reco. faciale + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuer sans déverrouillage par reconnaissance faciale"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre visage. Pour plus de sécurité, cette option doit être associée à un mode de verrouillage d\'écran secondaire."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre visage. Pour plus de sécurité, cette option doit être associée à un mode de verrouillage d\'écran secondaire."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Schéma • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Code • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Mot de passe • Visage • Empreinte digitale"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuer sans visage ni empreinte digitale"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Vous pouvez déverrouiller votre téléphone avec votre visage ou votre empreinte digitale. Pour des raisons de sécurité, définissez une méthode secondaire de verrouillage de l\'écran."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Vous pouvez déverrouiller votre téléphone avec votre visage ou votre empreinte digitale. Pour des raisons de sécurité, définissez une méthode secondaire de verrouillage de l\'écran."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par l\'admin, règles chiffrement, stockage ID"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayage"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Vous pouvez commencer à utiliser votre <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"État de la batterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveau de la batterie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Communs"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Paramètres communs"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Non défini"</string>
@@ -2021,7 +2031,7 @@
     <string name="lockpassword_choose_your_pattern_description" msgid="6808109256008481046">"Pour plus de sécurité, définissez un schéma pour déverrouiller l\'appareil"</string>
     <string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Définir un schéma professionnel"</string>
     <string name="lockpassword_choose_your_password_header_for_fingerprint" msgid="3167261267229254090">"Définissez un mot de passe"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Définissez un schéma"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_fingerprint" msgid="4707788269512303400">"Pour utiliser votre empreinte, définissez un schéma"</string>
     <string name="lockpassword_choose_your_pin_message" msgid="7230665212172041837">"Pour des raisons de sécurité, définissez un code"</string>
     <string name="lockpassword_choose_your_pin_header_for_fingerprint" msgid="2783879743691792556">"Définissez un code"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6132312814563023990">"Saisissez de nouveau votre mot de passe"</string>
@@ -5495,8 +5505,7 @@
     <string name="mobile_data_usage_title" msgid="2047864499317759728">"Consommation de données des applications"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"Mode réseau non valide <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Action ignorée."</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Noms des points d\'accès"</string>
-    <!-- no translation found for keywords_access_point_names (8174967126858505945) -->
-    <skip />
+    <string name="keywords_access_point_names" msgid="8174967126858505945">"APN"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"Moins de détails"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f511114..8dbae60 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Impresión dixital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Impresión dixital + contrasinal"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sen impresión dixital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Podes desbloquear o teléfono utilizando a túa impresión dixital. Por motivos de seguranza, esta opción require un bloqueo da pantalla alternativo."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Podes desbloquear o teléfono utilizando a túa impresión dixital. Por motivos de seguranza, esta opción require un bloqueo da pantalla alternativo."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueo facial e padrón"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueo facial e PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueo facial e contrasinal"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuar sen desbloqueo facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Podes desbloquear o teléfono utilizando a túa cara. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Podes desbloquear o teléfono utilizando a túa cara. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Padrón • Cara • Impresión dixital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Cara • Impresión dixital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Contrasinal • Cara • Impresión dixital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sen desbloqueo facial e sen impresión dixital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Podes desbloquear o teléfono coa cara ou cunha impresión dixital. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Podes desbloquear o teléfono coa cara ou cunha impresión dixital. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desactivado por admin., encriptación ou almac. credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ningún"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pasa o dedo"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Podes comezar a usar a túa <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Estado da batería"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivel de batería"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comúns"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Opcións de configuración comúns"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar punto de acceso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sen configurar"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index e3c2c58..d5907db 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ફિંગરપ્રિન્ટ + પિન"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ફિંગરપ્રિન્ટ + પાસવર્ડ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ફિંગરપ્રિન્ટ વગર ચાલુ રાખો"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"તમે તમારા ફોનને તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરીને અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ એક બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"તમે તમારા ફોનને તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરીને અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ એક બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ફેસ અનલૉક + પૅટર્ન"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ફેસ અનલૉક + પિન"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ફેસ અનલૉક + પાસવર્ડ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ફેસ અનલૉક વિના ચાલુ રાખો"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"તમે તમારા ફોનને તમારા ચહેરાની મદદથી અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"તમે તમારા ફોનને તમારા ચહેરાની મદદથી અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"પૅટર્ન • ફેસ • ફિંગરપ્રિન્ટ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"પિન • ફેસ • ફિંગરપ્રિન્ટ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"પાસવર્ડ • ફેસ • ફિંગરપ્રિન્ટ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ફેસ અનલૉક કે ફિંગરપ્રિન્ટ વિના આગળ વધો"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"તમે તમારા ચહેરા કે ફિંગરપ્રિન્ટનો ઉપયોગ કરીને તમારો ફોન અનલૉક કરી શકો છો. સુરક્ષા ખાતર, આ વિકલ્પ માટે બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"તમે તમારા ચહેરા કે ફિંગરપ્રિન્ટનો ઉપયોગ કરીને તમારો ફોન અનલૉક કરી શકો છો. સુરક્ષા ખાતર, આ વિકલ્પ માટે બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"વ્યવસ્થાપક, એન્ક્રિપ્શન પૉલિસી કે ક્રિડેન્શ્યલ સ્ટોરેજ વડે બંધ કરેલ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"કોઈ નહીં"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"સ્વાઇપ કરો"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"તમે તમારા <xliff:g id="NAME">^1</xliff:g>નો ઉપયોગ કરવાનું શરૂ કરી શકો છો"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"બૅટરી સ્થિતિ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"બૅટરી સ્તર"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"કૉમ્યુનલ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"કૉમ્યુનલ સેટિંગ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"અ‍ૅક્સેસ પૉઇન્ટમાં ફેરફાર કરો"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"સેટ નથી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a1dc27e..b4ef9f2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"फ़िंगरप्रिंट + पिन"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"फ़िंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"फ़िंगरप्रिंट के बिना जारी रखें"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"आप अपने फ़िंगरप्रिंट का उपयोग करके अपना फ़ोन अनलॉक कर सकते हैं. सुरक्षा के लिए, इस विकल्प के लिए बैकअप स्क्रीन लॉक आवश्यक है."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"आप अपने फ़िंगरप्रिंट का उपयोग करके अपना फ़ोन अनलॉक कर सकते हैं. सुरक्षा के लिए, इस विकल्प के लिए बैकअप स्क्रीन लॉक आवश्यक है."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"फ़ेस अनलॉक + पैटर्न"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"फ़ेस अनलॉक + पिन"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"फ़ेस अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"फ़ेस अनलॉक की सुविधा सेट अप किए बिना जारी रखें"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"आप अपने चेहरे के ज़रिए फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए, यह ज़रूरी है कि चेहरे के अलावा अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"आप अपने चेहरे के ज़रिए फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए, यह ज़रूरी है कि चेहरे के अलावा अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"पैटर्न • फ़ेस अनलॉक • फ़िंगरप्रिंट"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"पिन • फ़ेस अनलॉक • फ़िंगरप्रिंट"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"पासवर्ड • फ़ेस अनलॉक • फ़िंगरप्रिंट"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"फ़िंगरप्रिंट या फ़ेस अनलॉक सेट अप किए बिना आगे बढ़ें"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"आप अपने चेहरे या फ़िंगरप्रिंट का इस्तेमाल करके, अपने फ़ोन को अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए यह ज़रूरी है कि बायोमेट्रिक्स के अलावा, अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"आप अपने चेहरे या फ़िंगरप्रिंट का इस्तेमाल करके, अपने फ़ोन को अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए यह ज़रूरी है कि बायोमेट्रिक्स के अलावा, अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप करें"</string>
@@ -1097,7 +1109,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"ईएपी तरीका"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"फ़ेज़ 2 ऑथेंटिकेशन"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA सर्टिफ़िकेट"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"प्रमाणपत्र की ऑनलाइन स्थिति"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"सर्टिफ़िकेट का ऑनलाइन स्टेटस"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"डोमेन"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"उपयोगकर्ता सर्टिफ़िकेट"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"पहचान"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> का इस्तेमाल शुरू किया जा सकता है"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"बैटरी स्‍तर"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"कम्यूनिटी"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"कम्यूनिटी सेटिंग"</string>
     <string name="apn_settings" msgid="4295467389400441299">"ऐक्सेस पॉइंट नाम"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ऐक्सेस पॉइंट में बदलाव करें"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट नहीं है"</string>
@@ -3138,7 +3148,7 @@
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"बंद करें"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेंशियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"कोई सर्टिफ़िकेट इंस्टॉल करें"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"स्टोरेज से सर्टिफ़िकेट इंस्‍टॉल करें"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"एसडी कार्ड से सर्टिफ़िकेट इंस्‍टॉल करें"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"क्रेडेंशियल हटाएं"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"सभी सर्टिफ़िकेट हटाएं"</string>
@@ -3298,10 +3308,10 @@
     <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"ईथरनेट उपयोग दिखाएं"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"ईथरनेट उपयोग छिपाएं"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"नेटवर्क प्रतिबंध"</string>
-    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"अपने आप डेटा समन्वयन"</string>
+    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"डेटा अपने-आप सिंक होने की सुविधा"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"सिम कार्ड"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"सीमा पर रोका गया"</string>
-    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"अपने आप डेटा समन्वयन"</string>
+    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"डेटा अपने-आप सिंक होने की सुविधा"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"निजी डेटा अपने-आप सिंक हो जाए"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"काम से जुड़ा डेटा अपने-आप सिंक हो"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"चक्र बदलें ..."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dc210be..6e58d7e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Otisak prsta i PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Otisak prsta i zaporka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Nastavi bez otiska prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Možete otključati telefon otiskom prsta. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Možete otključati telefon otiskom prsta. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Otključavanje licem + uzorak"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Otključavanje licem + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Otključavanje licem + zaporka"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Nastavite bez otključavanja licem"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon svojim licem. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Možete otključati telefon svojim licem. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Uzorak • lice • otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • lice • otisak prsta"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Zaporka • lice • otisak prsta"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Nastavite bez otključavanja licem ili otiskom prsta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefon možete otključati licem ili otiskom prsta. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefon možete otključati licem ili otiskom prsta. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prelazak prstom"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 31def6f..01d0ed0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Ujjlenyomat + PIN-kód"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Ujjlenyomat + jelszó"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Folytatás ujjlenyomat nélkül"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefonját feloldhatja az ujjlenyomata segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefonját feloldhatja az ujjlenyomata segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Arcalapú feloldás + minta"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Arcalapú feloldás + PIN-kód"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Arcalapú feloldás + jelszó"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Folytatás Arcalapú feloldás nélkül"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Feloldhatja telefonját arca segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Feloldhatja telefonját arca segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Minta • Arc • Ujjlenyomat"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-kód • Arc • Ujjlenyomat"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Jelszó • Arc • Ujjlenyomat"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Folytatás arc- vagy ujjlenyomat-alapú feloldás nélkül"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Feloldhatja telefonja zárolását az arca vagy az ujjlenyomata használatával. Biztonsági okokból ennek a beállításnak az esetében szükség van másodlagos képernyőzárra is"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Feloldhatja telefonja zárolását az arca vagy az ujjlenyomata használatával. Biztonsági okokból ennek a beállításnak az esetében szükség van másodlagos képernyőzárra is"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Csúsztatás"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Megkezdheti a(z) <xliff:g id="NAME">^1</xliff:g> használatát"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akkumulátorszint"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Közösségi"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Közösségi beállítások"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ek"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Hozzáférési pont szerkesztése"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nincs megadva"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 168c0a5..84a8e33 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Մատնահետք + PIN կոդ"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Մատնահետք + գաղտնաբառ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Շարունակել առանց մատնահետքի"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Կարող եք ապակողպել հեռախոսը մատնահետքի օգնությամբ: Անվտանգության նկատառումներից ելնելով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Կարող եք ապակողպել հեռախոսը մատնահետքի օգնությամբ: Անվտանգության նկատառումներից ելնելով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Դեմքով ապակողպում + նախշ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Դեմքով ապակողպում + PIN կոդ"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Դեմքով ապակողպում + գաղտնաբառ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Շարունակել առանց դեմքով ապակողպման"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Դուք կարող եք ապակողպել հեռախոսը դեմքի ճանաչման միջոցով: Անվտանգության նկատառումներով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Դուք կարող եք ապակողպել հեռախոսը դեմքի ճանաչման միջոցով: Անվտանգության նկատառումներով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Նախշ • Դեմք • Մատնահետք"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Դեմք • Մատնահետք"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Գաղտնաբառ • Դեմք • Մատնահետք"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Շարունակել առանց դեմքով կամ մատնահետքով կողպման"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Դուք կարող եք ապակողպել հեռախոսը ձեր դեմքի կամ մատնահետքի օգնությամբ։ Անվտանգության նկատառումներից ելնելով՝ այս ընտրանքը պահանջում է էկրանի կողպման լրացուցիչ տարբերակ։"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Դուք կարող եք ապակողպել հեռախոսը ձեր դեմքի կամ մատնահետքի օգնությամբ։ Անվտանգության նկատառումներից ելնելով՝ այս ընտրանքը պահանջում է էկրանի կողպման լրացուցիչ տարբերակ։"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Անջատված է ադմինիստրատորի, գաղտնագրման քաղաքականության կամ հավատարմագրային պահոցի կողմից"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ոչ մեկը"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Սահեցնել"</string>
@@ -1531,7 +1543,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Նոր ծանուցումներ ստանալու դեպքում էկրանը կմիանա"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Միշտ ցույց տալ ժամը/տվյալները"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Մարտկոցի ավելի արագ սպառում"</string>
-    <string name="force_bold_text" msgid="4620929631102086716">"Թավ տառատեսակով տեքստ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Թավ տեքստ"</string>
     <string name="title_font_size" msgid="570613010306330622">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="8444689613442419978">"Տեքստի չափի փոփոխում"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Այժմ դուք կարող եք օգտագործել <xliff:g id="NAME">^1</xliff:g>ը"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Մարտկոցի կարգավիճակը"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Մարտկոցի մակարդակը"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ընդհանուր"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ընդհանուր կարգավորումներ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ներ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Խմբագրել մուտքի կետը"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Կարգավորված չէ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fb32f2e..ac760c7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Sidik Jari + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Sidik Jari + Sandi"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Lanjutkan tanpa sidik jari"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Anda dapat membuka kunci ponsel menggunakan sidik jari. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Anda dapat membuka kunci ponsel menggunakan sidik jari. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Buka dengan Wajah + Pola"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Buka dengan Wajah + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Buka dengan Wajah + Sandi"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Lanjutkan tanpa Buka dengan Wajah"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pola • Wajah • Sidik jari"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Wajah • Sidik jari"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Sandi • Wajah • Sidik jari"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Lanjutkan tanpa face unlock atau sidik jari"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Anda dapat membuka kunci ponsel menggunakan wajah atau sidik jari. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Anda dapat membuka kunci ponsel menggunakan wajah atau sidik jari. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Geser"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Anda dapat mulai menggunakan <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status baterai"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Tingkat baterai"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Umum"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Setelan umum"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edit titik akses"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Tidak disetel"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8b63e3a..aaf6dbd 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingrafar + PIN-númer"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingrafar + aðgangsorð"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Halda áfram án fingrafars"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Þú getur tekið símann úr lás með því að nota fingrafarið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Þú getur tekið símann úr lás með því að nota fingrafarið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Andlitskenni + mynstur"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Andlitskenni + PIN-númer"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Andlitskenni + aðgangsorð"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Halda áfram án andlitskennis"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Þú getur tekið símann úr lás með því að nota andlitið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Þú getur tekið símann úr lás með því að nota andlitið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mynstur • Andlit • Fingrafar"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-númer • Andlit • Fingrafar"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Aðgangsorð • Andlit • Fingrafar"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Halda áfram án andlits eða fingrafars"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Þú getur opnað símann með andlitinu eða fingrafari. Af öryggisástæðum krefst þessi valkostur þess að varaskjálás sé til staðar."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Þú getur opnað símann með andlitinu eða fingrafari. Af öryggisástæðum krefst þessi valkostur þess að varaskjálás sé til staðar."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Enginn"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Strjúka"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Þú getur byrjað að nota <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Staða rafhlöðu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Staða rafhlöðu"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Sameiginlegt"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Sameiginlegar stillingar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Aðgangsstaðir"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Breyta aðgangsstað"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ekki stillt"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b9cffef..9e71f51 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Impronta + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Impronta + password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continua senza impronta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Puoi sbloccare il telefono tramite la tua impronta. Per motivi di sicurezza questa opzione richiede un blocco schermo alternativo."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Puoi sbloccare il telefono tramite la tua impronta. Per motivi di sicurezza questa opzione richiede un blocco schermo alternativo."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Sblocco con il volto + sequenza"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Sblocco con il volto + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Sblocco con il volto + password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continua senza sblocco con il volto"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Puoi sbloccare il telefono usando il tuo volto. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Puoi sbloccare il telefono usando il tuo volto. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Sequenza • Volto • Impronta"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Volto • Impronta"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Volto • Impronta"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continua senza volto o impronta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Puoi sbloccare il telefono usando il tuo volto o la tua impronta. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Puoi sbloccare il telefono usando il tuo volto o la tua impronta. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Scorrimento"</string>
@@ -1097,7 +1109,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"Metodo EAP"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"Autenticazione fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"Certificato CA"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Stato dei certificati online"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"Stato del certificato online"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"Dominio"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"Certificato utente"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"Identità"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Puoi iniziare a utilizzare la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stato batteria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Livello batteria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Community"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Impostazioni Community"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifica punto di accesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nessuna impostazione"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ded997d..f52dc21 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"טביעת אצבע + קוד גישה"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"טביעת אצבע + סיסמה"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"המשך ללא טביעת אצבע"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"אפשר לבטל את נעילת הטלפון באמצעות טביעת אצבע. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"אפשר לבטל את נעילת הטלפון באמצעות טביעת אצבע. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"פתיחה ע\"י זיהוי הפנים וקו ביטול נעילה"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"פתיחה ע\"י זיהוי הפנים וקוד אימות"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"פתיחה ע\"י זיהוי הפנים וסיסמה"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"המשך ללא פתיחה ע\"י זיהוי הפנים"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ניתן לבטל את נעילת הטלפון באמצעות אימות פנים. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ניתן לבטל את נעילת הטלפון באמצעות אימות פנים. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"קו ביטול נעילה • פנים • טביעת אצבע"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"קוד אימות • פנים • טביעת אצבע"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"סיסמה • פנים • טביעת אצבע"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"המשך ללא הגדרה של זיהוי פנים או טביעת אצבע"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"אפשר לבטל את נעילת הטלפון בעזרת הפנים או טביעת האצבע שלך. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"אפשר לבטל את נעילת הטלפון בעזרת הפנים או טביעת האצבע שלך. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"הושבת על ידי מדיניות ההצפנה של מנהל המכשיר, או אחסון פרטי כניסה"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"החלקה"</string>
@@ -1806,10 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"אפשר להתחיל להשתמש ב<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"טעינת סוללה:"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"שיתופי"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"הגדרות שיתופיות"</string>
     <string name="apn_settings" msgid="4295467389400441299">"‏פריטי APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"עריכת נקודת גישה"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"לא בוצעה הגדרה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dfb06c6..d7ff31e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"指紋 + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"指紋 + パスワード"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"指紋を設定せずに続行"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"指紋を使ってスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"指紋を使ってスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"顔認証 + パターン"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"顔認証 + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"顔認証 + パスワード"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"顔認証を設定せずに続行"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"顔認証を使用してスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"顔認証を使用してスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"パターン • 顔 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • 顔 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"パスワード • 顔 • 指紋"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"顔認証や指紋認証を設定せずに続行"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"顔認証や指紋認証でスマートフォンのロックを解除できます。セキュリティ上の理由により、この機能を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"顔認証や指紋認証でスマートフォンのロックを解除できます。セキュリティ上の理由により、この機能を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"管理者、暗号化ポリシー、または認証情報ストレージにより無効化"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"スワイプ"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g>を使えるようになりました"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"電池の状態:"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"バッテリー残量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共用"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共用の設定"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"アクセスポイントの編集"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未設定"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index fc2e805..41f77cb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"თითის ანაბეჭდი + PIN-კოდი"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"თითის ანაბეჭდი + პაროლი"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"თითის ანაბეჭდის გარეშე გაგრძელება"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"თქვენი ტელეფონის განბლოკვა თითის ანაბეჭდით შეგეძლებათ. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი ეკრანის დაბლოკვის სარეზერვო მეთოდსაც საჭიროებს."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"თქვენი ტელეფონის განბლოკვა თითის ანაბეჭდით შეგეძლებათ. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი ეკრანის დაბლოკვის სარეზერვო მეთოდსაც საჭიროებს."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"სახით განბლოკვა + ნიმუში"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"სახით განბლოკვა + PIN-კოდი"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"სახით განბლოკვა + პაროლი"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"გაგრძელება სახით განბლოკვის გარეშე"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"თქვენი ტელეფონის განბლოკვას შეძლებთ სახის მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"თქვენი ტელეფონის განბლოკვას შეძლებთ სახის მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ნიმუში • სახე • თითის ანაბეჭდი"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-კოდი • სახე • თითის ანაბეჭდი"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"პაროლი • სახე • თითის ანაბეჭდი"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"სახის ან თითის ანაბეჭდის გარეშე გაგრძელება"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ტელეფონის განბლოკვა თქვენი სახით ან თითის ანაბეჭდით შეგიძლიათ. უსაფრთხოებისთვის საჭიროა ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ტელეფონის განბლოკვა თქვენი სახით ან თითის ანაბეჭდით შეგიძლიათ. უსაფრთხოებისთვის საჭიროა ეკრანის დაბლოკვის სარეზერვო მეთოდი."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"გათიშულია ადმინისტრატორის მიერ დაშიფვრის წესების ან სამომხმარებლო მონაცემების საცავის გამო"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"არც ერთი"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"გასრიალება"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"შეგიძლიათ, გამოიყენოთ <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ბატარეის სტატუსი"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ბატარეის დატენვის დონე"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"საერთო"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"საერთო პარამეტრები"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ები"</string>
     <string name="apn_edit" msgid="2003683641840248741">"წვდომის წერტილის რედაქტირება"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"არ არის დაყენებული"</string>
@@ -3143,7 +3153,7 @@
     <string name="credentials_reset" msgid="4246628389366452655">"ავტორიზაციის მონაცემების წაშლა"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"ყველა სერტიფიკატის წაშლა"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"საიმედო სერტიფიკატები"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"სანდო CA სერტიფიკატის ჩვენება"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"სანდო CA სერტიფიკატების ჩვენება"</string>
     <string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index fbca735..172d25d 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Саусақ ізі + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Саусақ ізі + құпия сөз"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Саусақ ізін пайдаланбау"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Телефон құлпын саусақ ізімен ашуға болады. Бұл опция қауіпсіздік мақсатында қосымша экран құлпын қажет етеді."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Телефон құлпын саусақ ізімен ашуға болады. Бұл опция қауіпсіздік мақсатында қосымша экран құлпын қажет етеді."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Бет тану + өрнек"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Бет тану + PIN коды"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Бет тану + құпия сөз"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Бет танусыз жалғастыру"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Телефонның құлпын бетті тану функциясымен ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Телефонның құлпын бетті тану функциясымен ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Өрнек • Бет • Саусақ ізі"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN коды • Бет • Саусақ ізі"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Құпия сөз • Бет • Саусақ ізі"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Бетті немесе саусақ ізін пайдаланбай жалғастыру"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Телефоныңыздың құлпын бет немесе саусақ ізі арқылы ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Телефоныңыздың құлпын бет немесе саусақ ізі арқылы ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Әкімші, шифрлау саясаты немесе тіркелкі деректерінің жады өшірген"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Жоқ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сырғыту"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> пайдалануға дайын"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Батарея күйі"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Батарея деңгейі"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Жалпы"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Жалпы параметрлер"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Кіру нүктесін өзгерту"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Қойылмаған"</string>
@@ -3141,7 +3151,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификаттарды қоймадан орнату"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Сертификаттарды SD картадан орнату"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"Тіркелу деректерін өшіру"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"Барлық сертификаттарды жою"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"Барлық сертификатты жою"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Сенімді тіркелу деректері"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Сенімді CA сертификаттарын көрсету"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index af5c554..dec5e59 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ស្នាមម្រាមដៃ + កូដ PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ស្នាមម្រាមដៃ + ពាក្យសម្ងាត់"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"បន្តដោយគ្មានស្នាមម្រាមដៃ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើស្នាមម្រាមដៃរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឲ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើស្នាមម្រាមដៃរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឲ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ការដោះសោ​តាមទម្រង់មុខ + លំនាំ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ការដោះសោ​តាមទម្រង់មុខ + កូដ PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ការដោះសោ​តាមទម្រង់មុខ + ពាក្យសម្ងាត់"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"បន្ត​ដោយមិនរៀបចំ​ការដោះសោតាមទម្រង់មុខ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើមុខរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឱ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើមុខរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឱ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"លំនាំ • មុខ • ស្នាមម្រាមដៃ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"កូដ PIN • មុខ • ស្នាមម្រាមដៃ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"ពាក្យសម្ងាត់ • មុខ • ស្នាមម្រាមដៃ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"បន្ត​ដោយគ្មាន​មុខ ឬ​ស្នាមម្រាមដៃ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"អ្នកអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​មុខ ឬ​ស្នាមម្រាមដៃ​របស់អ្នក​។ ដើម្បី​សុវត្ថិភាព ជម្រើសនេះ​តម្រូវឱ្យមាន​ការចាក់សោអេក្រង់​បម្រុង។"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"អ្នកអាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​មុខ ឬ​ស្នាមម្រាមដៃ​របស់អ្នក​។ ដើម្បី​សុវត្ថិភាព ជម្រើសនេះ​តម្រូវឱ្យមាន​ការចាក់សោអេក្រង់​បម្រុង។"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"បិទដោយអ្នកគ្រប់គ្រង គោលការណ៍​អ៊ិនគ្រីប ឬទំហំផ្ទុកព័ត៌មានសម្គាល់ខ្លួន"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"គ្មាន"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"អូស"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"អ្នក​អាច​ចាប់ផ្ដើម​ប្រើប្រាស់​<xliff:g id="NAME">^1</xliff:g> របស់​អ្នក​បាន​ហើយ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ស្ថានភាព​ថ្ម"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"កម្រិត​ថ្ម"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ទូទៅ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ការកំណត់ទូទៅ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"កែ​ចំណុច​ចូលប្រើប្រាស់"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"មិនបានកំណត់"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 1975a89..699c53d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ + ಪಿನ್"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ಫಿಂಗರ್‌ಫ್ರಿಂಟ್‌ ಇಲ್ಲದೆ ಮುಂದುವರಿಸಿ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಒಂದು ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಒಂದು ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ + ಪ್ಯಾಟರ್ನ್"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ + ಪಿನ್‌‌"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಯಿರಿ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ಪ್ಯಾಟರ್ನ್ • ಫೇಸ್ • ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ಪಿನ್‌‌ • ಫೇಸ್ • ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"ಪಾಸ್‌ವರ್ಡ್ • ಫೇಸ್ • ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ಫೇಸ್ ಅಥವಾ ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಸಿ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ನಿಮ್ಮ ಫೇಸ್ ಅಥವಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಸುರಕ್ಷತೆಯ ದೃಷ್ಟಿಯಿಂದ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ನಿಮ್ಮ ಫೇಸ್ ಅಥವಾ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಸುರಕ್ಷತೆಯ ದೃಷ್ಟಿಯಿಂದ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ಅಡ್ಮಿನ್, ಎನ್‍ಕ್ರಿಪ್ಷನ್, ರುಜುವಾತಿನಿಂದಾಗಿ ನಿಷ್ಕ್ರಿಯ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ಸ್ವೈಪ್"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಬಳಸುವುದನ್ನು ನೀವು ಪ್ರಾರಂಭಿಸಬಹುದು"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ಬ್ಯಾಟರಿ ಸ್ಥಿತಿ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ಸಮುದಾಯ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ಸಮುದಾಯದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN ಗಳು"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ಆ್ಯಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ಹೊಂದಿಸಿಲ್ಲ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5a8a238..e1afe77 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"지문 + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"지문 + 비밀번호"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"지문 없이 계속하기"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"지문을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"지문을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"얼굴 인식 잠금 해제 + 패턴"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"얼굴 인식 잠금 해제 + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"얼굴 인식 잠금 해제 + 비밀번호"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"얼굴 인식 잠금 해제 없이 계속하기"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"얼굴을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"얼굴을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"패턴 • 얼굴 인식 • 지문"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • 얼굴 인식 • 지문"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"비밀번호 • 얼굴 인식 • 지문"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"얼굴 인식 또는 지문 없이 계속"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"얼굴 인식 또는 지문을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"얼굴 인식 또는 지문을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"관리자, 암호화 정책 또는 사용자 인증 정보 저장소에 의해 사용 중지됨"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"스와이프"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"이제 <xliff:g id="NAME">^1</xliff:g>을(를) 사용할 수 있습니다"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"배터리 상태"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"배터리 수준"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"커뮤니티"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"커뮤니티 설정"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"액세스 포인트 수정"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"설정되지 않음"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 40b8661..1ab62ac 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Манжа изи + PIN код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Манжа изи + Сырсөз"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Манжа изи жөндөөсү жок улантуу"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Телефонуңуздун кулпусун манжаңыздын изи менен ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Телефонуңуздун кулпусун манжаңыздын изи менен ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Жүзүнөн таанып ачуу + Графикалык ачкыч"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Жүзүнөн таанып ачуу + PIN код"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Жүзүнөн таанып ачуу + Сырсөз"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Жүзүнөн таанып ачуу функциясыз уланта берүү"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Телефонуңуздун кулпусун жүзүңүздү көрсөтүп ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Телефонуңуздун кулпусун жүзүңүздү көрсөтүп ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Графикалык ачкыч • Жүз • Манжа изи"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN код • Жүз • Манжа изи"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Сырсөз • Жүз • Манжа изи"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Жүз же манжа изисиз улантуу"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Телефонуңуздун кулпусун жүзүңүз же манжа изиңиз менен ача аласыз. Коопсуздук максатында, кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Телефонуңуздун кулпусун жүзүңүз же манжа изиңиз менен ача аласыз. Коопсуздук максатында, кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Администратор же башка эрежелер б-ча тыюу салынган"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Жок"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сүрүү"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> колдонууга даяр"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Батареянын абалы"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Батарея деңгээли"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Жалпы"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Жалпы параметрлер"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'дер"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Байланыш түйүнүн өзгөртүү"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Коюлган эмес"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index a6d982b..e4e8f36 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ລາຍນິ້ວມື + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ລາຍນິ້ວມື + ລະຫັດຜ່ານ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ດຳເນີນການຕໍ່ໂດຍບໍ່ໃຊ້ລາຍນິ້ວມື"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ລາຍນິ້ວມືໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ລາຍນິ້ວມືໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ປົດລັອກດ້ວຍໜ້າ + ຮູບແບບ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ປົດລັອກດ້ວຍໜ້າ + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ປົດລັອກດ້ວຍໜ້າ + ລະຫັດຜ່ານ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ສືບຕໍ່ໂດຍບໍ່ຕ້ອງໃຊ້ການປົດລັອກດ້ວຍໜ້າ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ໃບໜ້າຂອງທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ໃບໜ້າຂອງທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ຮູບແບບ • ໜ້າ • ລາຍນິ້ວມື"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • ໜ້າ • ລາຍນິ້ວມື"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"ລະຫັດຜ່ານ • ໜ້າ • ລາຍນິ້ວມື"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ສືບຕໍ່ໂດຍບໍ່ໃຊ້ໜ້າ ຫຼື ລາຍນິ້ວມື"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ໂດຍການໃຊ້ໜ້າ ຫຼື ລາຍນິ້ວມືຂອງທ່ານ. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ໂດຍການໃຊ້ໜ້າ ຫຼື ລາຍນິ້ວມືຂອງທ່ານ. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼື ບ່ອນຈັດເກັບຂໍ້ມູນລັບ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ປັດ​ໄປ​ຂ້າງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4f9f0a0..f9828b7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Piršto antspaudas + PIN kodas"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Piršto antspaudas + slaptažodis"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Tęsti be piršto antspaudo"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefoną galite atrakinti piršto antspaudu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefoną galite atrakinti piršto antspaudu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Atrakinimas pagal veidą ir atrakinimo piešinys"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Atrakinimas pagal veidą ir PIN kodas"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Atrakinimas pagal veidą ir slaptažodis"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Tęsti nenaudojant atrakinimo pagal veidą"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefoną galite atrakinti naudodami veidą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefoną galite atrakinti naudodami veidą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Atrak. piešinys • Veidas • Kontrolinis kodas"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN kodas • Veidas • Kontrolinis kodas"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Slaptažodis • Veidas • Kontrolinis kodas"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Tęsti be veido atpažinimo ar kontrolinio kodo"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefoną galite atrakinti naudodami atpažinimą pagal veidą arba kontrolinį kodą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefoną galite atrakinti naudodami atpažinimą pagal veidą arba kontrolinį kodą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Neleido: admin., šifr. polit. ar pr. duom. atmin."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Perbraukti"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Galite pradėti naudodami „<xliff:g id="NAME">^1</xliff:g>“"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akumuliatoriaus lygis"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Bendruomenės"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Bendruomenės nustatymai"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redaguoti prieigos tašką"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenustatyta"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b74392e..a9566d3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Pirksta nospiedums un PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Pirksta nospiedums un parole"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Turpināt bez pirksta nospieduma"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Varat autorizēt savu tālruni, izmantojot pirksta nospiedumu. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Varat autorizēt savu tālruni, izmantojot pirksta nospiedumu. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Autorizācija pēc sejas un kombinācija"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Autorizācija pēc sejas un PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Autorizācija pēc sejas un parole"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Turpināt bez autorizācijas pēc sejas"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Varat atbloķēt savu tālruni, izmantojot seju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Varat atbloķēt savu tālruni, izmantojot seju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Kombinācija • seja • pirksta nospiedums"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • seja • pirksta nospiedums"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Parole • seja • pirksta nospiedums"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Turpināt, neiestatot seju vai pirksta nospiedumu"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Varat autorizēt tālruni, izmantojot seju vai pirksta nospiedumu. Drošības nolūkos šai iespējai nepieciešama rezerves ekrāna bloķēšanas funkcija."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Varat autorizēt tālruni, izmantojot seju vai pirksta nospiedumu. Drošības nolūkos šai iespējai nepieciešama rezerves ekrāna bloķēšanas funkcija."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Atspējoja administrators, šifrēšanas politika vai akreditācijas datu maiņa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vilkšana"</string>
@@ -1806,10 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Varat sākt izmantot: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Akumulatora uzlādes līmenis"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Kopīgie"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Kopīgie iestatījumi"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediģēt piekļuves punktu"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nav iestatīts"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6e2f114..d1baf28 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Отпечаток + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Отпечаток + лозинка"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Продолжете без отпечаток"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Може да го отклучувате телефонот со вашиот отпечаток. Од безбедносни причини, за оваа опција е потребно резервно заклучување на екранот."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Може да го отклучувате телефонот со вашиот отпечаток. Од безбедносни причини, за оваа опција е потребно резервно заклучување на екранот."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Отклучување со лик + шема"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Отклучување со лик + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Отклучување со лик + лозинка"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Продолжете без „Отклучување со лик“"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Може да го отклучите телефонот со лицето. Од безбедносни причини, потребно резервно заклучување екран за оваа опција."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Може да го отклучите телефонот со лицето. Од безбедносни причини, потребно резервно заклучување екран за оваа опција."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Шема • Лик • Отпечаток"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Лик • Отпечаток"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Лозинка • Лик • Отпечаток"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Продолжи без лик или отпечаток"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Може да го отклучувате телефонот со лик или отпечаток. Од безбедносни причини, потребно резервно заклучување на екранот за опцијава."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Може да го отклучувате телефонот со лик или отпечаток. Од безбедносни причини, потребно резервно заклучување на екранот за опцијава."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Оневозм. од админ., шифрир. или складир. акредит."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ниедна"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Повлечи"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a753759..d322f64 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ഫിംഗർപ്രിന്റ് + പിൻ"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ഫിംഗർപ്രിന്റ് + പാസ്‌വേഡ്"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ഫിംഗർപ്രിന്റ് ഇല്ലാതെ തുടരുക"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാവുന്നതാണ്. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷനൊരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാവുന്നതാണ്. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷനൊരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ഫെയ്‌സ് അൺലോക്ക് + പാറ്റേൺ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ഫെയ്‌സ് അൺലോക്ക് + പിൻ"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ഫെയ്‌സ് അൺലോക്ക് + പാസ്‌വേഡ്"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ഫെയ്‌സ് അൺലോക്ക് ഇല്ലാതെ തുടരുക"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"നിങ്ങളുടെ മുഖം ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാവും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"നിങ്ങളുടെ മുഖം ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാവും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"പാറ്റേൺ • മുഖം • ഫിംഗർപ്രിന്റ്"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"പിൻ • മുഖം • ഫിംഗർപ്രിന്റ്"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"പാസ്‍വേഡ് • മുഖം • ഫിംഗർപ്രിന്റ്"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"മുഖമോ ഫിംഗർപ്രിന്റോ ഇല്ലാതെ തുടരുക"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"നിങ്ങളുടെ മുഖമോ ഫിംഗർപ്രിന്റോ ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാകും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"നിങ്ങളുടെ മുഖമോ ഫിംഗർപ്രിന്റോ ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാകും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"അഡ്‌മിനോ എൻക്രിപ്‌ഷൻ നയമോ ക്രെഡൻഷ്യൽ സ്റ്റോറേജോ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ഒന്നുമില്ല"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"സ്വൈപ്പ് ചെയ്യുക"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"നിങ്ങൾക്ക് <xliff:g id="NAME">^1</xliff:g> ഉപയോഗിക്കാൻ ആരംഭിക്കാം"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ബാറ്ററി നില"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ബാറ്ററി നില"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"കമ്മ്യൂണൽ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"കമ്മ്യൂണൽ ക്രമീകരണങ്ങൾ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-കൾ"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ആക്‌സസ് പോയിന്റ് എഡിറ്റ് ചെയ്യുക"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e08f05c..4877df7 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Хурууны хээ + ПИН"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Хурууны хээ + Нууц үг"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Хурууны хээгүйгээр үргэлжлүүлэх"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Та утасныхаа түгжээг хурууны хээг ашиглан тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Та утасныхаа түгжээг хурууны хээг ашиглан тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Царайгаар түгжээ тайлах + Хээ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Царайгаар түгжээ тайлах + ПИН"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Царайгаар түгжээ тайлах + Нууц үг"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Царайгаар түгжээ тайлахгүйгээр үргэлжлүүлэх"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Та царайгаа ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Та царайгаа ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Хээ • Царай • Хурууны хээ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ПИН • Царай • Хурууны хээ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Нууц үг • Царай • Хурууны хээ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Царай эсвэл хурууны хээгүйгээр үргэлжлүүлэх"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Та утасныхаа түгжээг царай эсвэл хурууны хээгээ ашиглан тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод дэлгэцийн нөөц түгжээ шаардлагатай."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Та утасныхаа түгжээг царай эсвэл хурууны хээгээ ашиглан тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод дэлгэцийн нөөц түгжээ шаардлагатай."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Админ, шифрлэлтийн бодлого, эсвэл итгэмжлэлийн сангаас цуцалсан"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Байхгүй"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Шудрах"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Та өөрийн <xliff:g id="NAME">^1</xliff:g>-г ашиглаж эхлэх боломжтой"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Зайны статус"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Зайны түвшин"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Нийтийн"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Нийтийн тохиргоо"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Хандалтын цэгийг засах"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Тохируулаагүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index badb410..cbee6f6 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"फिंगरप्रिंट + पिन"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"फिंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"फिंगरप्रिंट न वापरता सुरू ठेवा"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"तुम्ही आपल्या फिंगरप्रिंटचा वापर करून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायाकरिता एक बॅक अप स्क्रीन लॉक आवश्यक आहे."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"तुम्ही आपल्या फिंगरप्रिंटचा वापर करून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायाकरिता एक बॅक अप स्क्रीन लॉक आवश्यक आहे."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"फेस अनलॉक + पॅटर्न"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"फेस अनलॉक + पिन"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"फेस अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"फेस अनलॉक शिवाय पुढे सुरू ठेवा"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"तुम्ही तुमचा चेहरा वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायासाठी बॅकअप स्क्रीन लॉक आवश्यक आहे."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"तुम्ही तुमचा चेहरा वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायासाठी बॅकअप स्क्रीन लॉक आवश्यक आहे."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"पॅटर्न • फेस • फिंगरप्रिंट"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"पिन • फेस • फिंगरप्रिंट"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"पासवर्ड • फेस • फिंगरप्रिंट"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"फेस अनलॉक किंवा फिंगरप्रिंटशिवाय पुढे सुरू ठेवा"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"तुम्ही तुमचा चेहरा किंवा फिंगरप्रिंट वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षेसाठी, या पर्यायाला बॅकअप स्क्रीन लॉकची आवश्यकता आहे."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"तुम्ही तुमचा चेहरा किंवा फिंगरप्रिंट वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षेसाठी, या पर्यायाला बॅकअप स्क्रीन लॉकची आवश्यकता आहे."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, कूटबद्धीकरण धोरण किंवा क्रेडेन्शियल संचयनाद्वारे अक्षम केलेले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्‍वाइप करा"</string>
@@ -1097,7 +1109,7 @@
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP पद्धत"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"टप्पा 2 प्रमाणीकरण"</string>
     <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA प्रमाणपत्र"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ऑनलाइन प्रमाणपत्र स्थिती"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ऑनलाइन प्रमाणपत्र स्टेटस"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"डोमेन"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"वापरकर्ता प्रमाणपत्र"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ओळख"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"तुम्ही तुमचे <xliff:g id="NAME">^1</xliff:g> वापरणे सुरू करू शकता"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"बॅटरी पातळी"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"सामुदायिक"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"सामुदायिक सेटिंग्ज"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"अ‍ॅक्सेस पॉइंट संपादित करा"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट नाही"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 15628ed..3849fb2 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Cap Jari + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Cap Jari + Kata Laluan"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Teruskan tanpa cap jari"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Anda boleh membuka kunci telefon menggunakan cap jari. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Anda boleh membuka kunci telefon menggunakan cap jari. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Buka Kunci Wajah + Corak"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Buka Kunci Wajah + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Buka Kunci Wajah + Kata Laluan"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Teruskan tanpa Buka Kunci Wajah"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Anda boleh membuka kunci telefon menggunakan wajah. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Anda boleh membuka kunci telefon menggunakan wajah. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Corak • Wajah • Cap Jari"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Wajah • Cap Jari"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Kata Laluan • Wajah • Cap Jari"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Teruskan tanpa wajah atau cap jari"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Anda boleh membuka kunci telefon anda menggunakan wajah atau cap jari anda. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Anda boleh membuka kunci telefon anda menggunakan wajah atau cap jari anda. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dlumpuhkn pentadbir, dsr penyulitan/storan bukti klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Leret"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 398dda8..3937611 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"လက်ဗွေ + ပင်နံပါတ်"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"လက်ဗွေ + စကားဝှက်"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"လက်ဗွေမပါဘဲ ဆက်လုပ်ရန်"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"သင်၏ လက်ဗွေကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက မျက်နှာပြင်လော့ခ်ချသည့် မိတ္တူတစ်ခု လိုအပ်ပါသည်။"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"သင်၏ လက်ဗွေကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက မျက်နှာပြင်လော့ခ်ချသည့် မိတ္တူတစ်ခု လိုအပ်ပါသည်။"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း + ပုံစံ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း + ပင်နံပါတ်"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း + စကားဝှက်"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း မသုံးဘဲ ရှေ့ဆက်ခြင်း"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"သင့်မျက်နှာကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက အရန်မျက်နှာပြင်လော့ခ်တစ်ခု လိုအပ်ပါသည်။"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"သင့်မျက်နှာကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက အရန်မျက်နှာပြင်လော့ခ်တစ်ခု လိုအပ်ပါသည်။"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ပုံစံ • မျက်နှာ • လက်ဗွေ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ပင်နံပါတ် • မျက်နှာ • လက်ဗွေ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"စကားဝှက် • မျက်နှာ • လက်ဗွေ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"မျက်နှာ (သို့) လက်ဗွေ မသုံးဘဲ ရှေ့ဆက်ခြင်း"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"သင့်မျက်နှာ (သို့) လက်ဗွေကို သုံး၍ သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းဖန်သားပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"သင့်မျက်နှာ (သို့) လက်ဗွေကို သုံး၍ သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းဖန်သားပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"စီမံခန့်ခွဲသူ၊ အသွင်ဝှက်ခြင်း မူဝါဒ သို့မဟုတ် အထောက်အထား သိုလှောင်ခန်းက ပိတ်ထားပါသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"မရှိ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ပွတ်ဆွဲရန်"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"သင်၏ <xliff:g id="NAME">^1</xliff:g> ကို စသုံးနိုင်ပါပြီ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ဘက်ထရီအခြေအနေ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ဘက်ထရီ အားအဆင့်"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"အများသုံး"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"အများသုံး ဆက်တင်များ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"အဝင်ပွိုင့် ပြင်ဆင်ရန်"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"သတ်မှတ်မထားပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cd3c41d..3118fa1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingeravtrykk og PIN-kode"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingeravtrykk og passord"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Fortsett uten fingeravtrykk"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Du kan låse opp telefonen din med fingeravtrykket ditt. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Du kan låse opp telefonen din med fingeravtrykket ditt. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ansiktslås + mønster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ansiktslås + PIN-kode"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ansiktslås + passord"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Fortsett uten ansiktslås"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse opp telefonen med ansiktet. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Du kan låse opp telefonen med ansiktet. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mønster • Ansikt • Fingeravtrykk"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-kode • Ansikt • Fingeravtrykk"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Passord • Ansikt • Fingeravtrykk"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Fortsett uten ansikt eller fingeravtrykk"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Du kan låse opp telefonen med ansiktet eller fingeravtrykket. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Du kan låse opp telefonen med ansiktet eller fingeravtrykket. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Avslått av admin, krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Sveip"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan begynne å bruke <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batterinivå"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Felles"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Fellesinnstillinger"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Rediger tilgangspunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ikke angitt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5a2d7bc..5a6bcdd 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"फिंगरप्रिन्ट + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"फिंगरप्रिन्ट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"फिंगरप्रिन्ट बिना जारी राख्नुहोस्"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"तपाईं आफ्नो फिंगरप्रिन्टको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षाका खातिर यस विकल्पलाई एउटा ब्याकअप स्क्रिन लकको आवश्यकता पर्दछ।"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"तपाईं आफ्नो फिंगरप्रिन्टको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षाका खातिर यस विकल्पलाई एउटा ब्याकअप स्क्रिन लकको आवश्यकता पर्दछ।"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"फेस अनलक + प्याटर्न"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"फेस अनलक + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"फेस अनलक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"फेस अनलक सेटअप नगरिकन जारी राख्नुहोस्"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"तपाईं आफ्नो अनुहारको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"तपाईं आफ्नो अनुहारको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"प्याटर्न • फेस • फिंगरप्रिन्ट"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • फेस • फिंगरप्रिन्ट"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"पासवर्ड • फेस • फिंगरप्रिन्ट"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"फेस वा फिंगरप्रिन्ट सेटअप नगरिकन जारी राख्नुहोस्"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"तपाईं आफ्नो फेस वा फिंगरप्रिन्ट प्रयोग गरी फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लक सेटअप गर्नु पर्ने हुन्छ।"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"तपाईं आफ्नो फेस वा फिंगरप्रिन्ट प्रयोग गरी फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लक सेटअप गर्नु पर्ने हुन्छ।"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक भण्डारणद्वारा असक्षम पारिएको छ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"छैन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"तपाईं आफ्नो <xliff:g id="NAME">^1</xliff:g> प्रयोग गर्न थाल्न सक्नुहुन्छ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ब्याट्री स्थिति"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ब्याट्री स्तर"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"सामुदायिक"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"समुदायसम्बन्धी सेटिङ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"एक्सेस पोइन्ट सम्पादन गर्नुहोस्"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"सेट गरिएको छैन"</string>
@@ -3142,7 +3152,7 @@
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD कार्डबाट सर्टिफिकेट इन्स्टल गर्नुहोस्"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"क्रिडेन्सियल हटाउनुहोस्"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"सबै सर्टिफिकेटहरू हटाउनुहोस्"</string>
-    <string name="trusted_credentials" msgid="2522784976058244683">"विश्वस्त क्रिडेन्सियल"</string>
+    <string name="trusted_credentials" msgid="2522784976058244683">"विश्वसनीय क्रिडेन्सियल"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"विश्वस्त CA सर्टिफिकेट देखाइयोस्"</string>
     <string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका क्रिडेन्सियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"भण्डारण गरिएका क्रिडेन्सियल हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9ede3e2..0555617 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Vingerafdruk + pincode"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Vingerafdruk + wachtwoord"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Doorgaan zonder vingerafdruk"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Je kunt je telefoon ontgrendelen met je vingerafdruk. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Je kunt je telefoon ontgrendelen met je vingerafdruk. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ontgrendelen via gezichtsherkenning + patroon"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ontgrendelen via gezichtsherkenning + pincode"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ontgrendelen via gezicht + wachtwoord"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Doorgaan zonder Ontgrendelen via gezichtsherkenning"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Je kunt je telefoon ontgrendelen met je gezicht. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Je kunt je telefoon ontgrendelen met je gezicht. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Patroon • Gezicht • Vingerafdruk"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Pincode • Gezicht • Vingerafdruk"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Wachtwoord • Gezicht • Vingerafdruk"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Doorgaan zonder gezicht of vingerafdruk"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Je kunt je telefoon ontgrendelen met je gezicht of vingerafdruk. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Je kunt je telefoon ontgrendelen met je gezicht of vingerafdruk. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Uitgezet door beheerder, versleutelingsbeleid of opslag certificaatgegevens"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipen"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Je kunt je <xliff:g id="NAME">^1</xliff:g> gebruiken"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batterijstatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Accuniveau"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Gemeenschappelijk"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Gemeenschappelijke instellingen"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'s"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Toegangspunt bewerken"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Niet ingesteld"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ea00e84..7b235ab 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -330,7 +330,7 @@
     <string name="location_settings_footer_learn_more_content_description" msgid="5329024810729665156">"ଲୋକେସନ ସେଟିଂସ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ।"</string>
     <string name="account_settings_title" msgid="9138880127246241885">"ଆକାଉଣ୍ଟ"</string>
     <string name="security_settings_title" msgid="6710768415432791970">"ସୁରକ୍ଷା"</string>
-    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ଏନକ୍ରିପ୍ସନ୍‌ ଓ କ୍ରେଡେନସିଆଲ୍‌"</string>
+    <string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"ଏନକ୍ରିପ୍ସନ ଓ କ୍ରେଡେନସିଆଲ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="5298195959570992363">"ଫୋନ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
     <string name="not_encrypted_summary" product="default" msgid="2251945842585788254">"ଫୋନକୁ ଏନକ୍ରିପ୍ଟ କରାଯାଇନାହିଁ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="3776741531205406800">"ଡିଭାଇସ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି"</string>
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ଟିପଚିହ୍ନ + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ଟିପଚିହ୍ନ + ପାସ୍‌ୱାର୍ଡ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ଟିପଚିହ୍ନ ବିନା ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରି ନିଜ ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରି ନିଜ ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ଫେସ୍ ଅନଲକ୍ + ପାଟର୍ନ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ଫେସ୍ ଅନଲକ୍ + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ଫେସ୍ ଅନଲକ୍ + ପାସୱାର୍ଡ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ଫେସ୍ ଅନଲକ୍ ବିନା ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ନିଜର ଫେସ୍‍ ବ୍ୟବହାର କରି ନିଜର ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ନିଜର ଫେସ୍‍ ବ୍ୟବହାର କରି ନିଜର ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ପାଟର୍ନ • ଫେସ୍• ଟିପଚିହ୍ନ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • ଫେସ୍ • ଟିପଚିହ୍ନ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"ପାସୱାର୍ଡ • ଫେସ୍ • ଟିପଚିହ୍ନ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ଫେସ୍ ଏବଂ ଟିପଚିହ୍ନ ବିନା ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ଆପଣ ଆପଣଙ୍କ ଫେସ୍ ବା ଟିପଚିହ୍ନ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ। ସୁରକ୍ଷା ପାଇଁ, ଏହି ବିକଳ୍ପ ଏକ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ କରେ।"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ଆପଣ ଆପଣଙ୍କ ଫେସ୍ ବା ଟିପଚିହ୍ନ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ। ସୁରକ୍ଷା ପାଇଁ, ଏହି ବିକଳ୍ପ ଏକ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ କରେ।"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ପ୍ରଶାସକ, ଏନକ୍ରିପ୍‌ଶନ୍‌ ନୀତି, କିମ୍ବା କ୍ରେଡେନ୍‌ଶିଆଲ୍‌ ଷ୍ଟୋରେଜ୍‌ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"କିଛି ନାହିଁ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ସ୍ୱାଇପ"</string>
@@ -1096,8 +1108,8 @@
     <string name="passpoint_content" msgid="5219226173518418335">"<xliff:g id="NAME">%1$s</xliff:g> କ୍ରେଡେନ୍ସିଆଲ୍‌"</string>
     <string name="wifi_eap_method" msgid="3776009521349381742">"EAP ପଦ୍ଧତି"</string>
     <string name="please_select_phase2" msgid="577633852089847142">"2ୟ ପର୍ଯ୍ୟାୟ ପ୍ରମାଣୀକରଣ"</string>
-    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA ସାର୍ଟିଫିକେଟ୍‌"</string>
-    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ଅନ୍‍ଲାଇନ୍ ସାର୍ଟିଫିକେଟ୍ ସ୍ଥିତି"</string>
+    <string name="wifi_eap_ca_cert" msgid="8033404008276298886">"CA ସାର୍ଟିଫିକେଟ"</string>
+    <string name="wifi_eap_ocsp" msgid="8713933962516871238">"ଅନଲାଇନ ସାର୍ଟିଫିକେଟ ସ୍ଥିତି"</string>
     <string name="wifi_eap_domain" msgid="8304301470752333203">"ଡୋମେନ୍"</string>
     <string name="wifi_eap_user_cert" msgid="3569182430929173220">"ଉପଯୋଗକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ୍‌"</string>
     <string name="wifi_eap_identity" msgid="3629406902174137028">"ପରିଚୟ"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ଆପଣ ଆପଣଙ୍କ <xliff:g id="NAME">^1</xliff:g> ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିପାରିବେ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ବ୍ୟାଟେରୀ ସ୍ଥିତି"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ବ୍ୟାଟେରୀ ସ୍ତର"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"କମ୍ୟୁନାଲ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"କମ୍ୟୁନାଲ ସେଟିଂସ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ଆକ୍ସେସ ପଏଣ୍ଟକୁ ଏଡିଟ କରନ୍ତୁ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ସେଟ ହୋଇନାହିଁ"</string>
@@ -3136,15 +3146,15 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ଆପଣଙ୍କ ନେଟୱାର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ପରିଚାଳନା କରି ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଏ ଏବଂ ଡିଭାଇସର କାର୍ଯ୍ୟଦକ୍ଷତାକୁ ଉନ୍ନତ କରେ"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"ଚାଲୁ ଅଛି"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"ବନ୍ଦ ଅଛି"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ୍ ଷ୍ଟୋରେଜ୍"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ ଷ୍ଟୋରେଜ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ଏକ ସାର୍ଟିଫିକେଟ୍ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ଷ୍ଟୋରେଜ୍‌ରୁ ସାର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD କାର୍ଡରୁ ସର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"କ୍ରେଡେନସିଆଲ୍ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"ସବୁ ସାର୍ଟିଫିକେଟ୍ କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="trusted_credentials" msgid="2522784976058244683">"ବିଶ୍ୱସନୀୟ କ୍ରେଡେନସିଆଲ୍‌"</string>
-    <string name="trusted_credentials_summary" msgid="345822338358409468">"ବିଶ୍ୱସ୍ତ CA ସାର୍ଟିଫିକେଟ୍‌ ଡିସପ୍ଲେ କରନ୍ତୁ"</string>
-    <string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"କ୍ରେଡେନସିଆଲ ଖାଲି କରିଦିଅନ୍ତୁ"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"ସବୁ ସାର୍ଟିଫିକେଟକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="trusted_credentials" msgid="2522784976058244683">"ବିଶ୍ୱସ୍ତ କ୍ରେଡେନସିଆଲ"</string>
+    <string name="trusted_credentials_summary" msgid="345822338358409468">"ବିଶ୍ୱସ୍ତ CA ସାର୍ଟିଫିକେଟ ଡିସପ୍ଲେ କରନ୍ତୁ"</string>
+    <string name="user_credentials" msgid="4044405430790970775">"ୟୁଜର କ୍ରେଡେନସିଆଲ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ଷ୍ଟୋର୍ କରାଯାଇଥିବା କ୍ରେଡେନ୍ସିଆଲକୁ ଦେଖି ଏହାକୁ ବଦଳାନ୍ତୁ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 835657c..ff3265f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਿੰਨ"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਾਸਵਰਡ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ਫ਼ੇਸ ਅਣਲਾਕ + ਪੈਟਰਨ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ਫ਼ੇਸ ਅਣਲਾਕ + ਪਿੰਨ"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ਫ਼ੇਸ ਅਣਲਾਕ + ਪਾਸਵਰਡ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ਫ਼ੇਸ ਅਣਲਾਕ ਤੋਂ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ਪੈਟਰਨ • ਚਿਹਰਾ • ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"ਪਿੰਨ • ਚਿਹਰਾ • ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"ਪਾਸਵਰਡ • ਚਿਹਰਾ • ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ਫ਼ੇਸ ਜਾਂ ਫਿੰਗਰਪ੍ਰਿੰਟ ਤੋਂ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਜਾਂ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਜਾਂ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ਪ੍ਰਸ਼ਾਸਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੀਤੀ ਜਾਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ਸਵਾਈਪ ਕਰੋ"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ਤੁਸੀਂ ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਦੀ ਵਰਤੋਂ ਸ਼ੁਰੂ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"ਬੈਟਰੀ ਸਥਿਤੀ"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"ਬੈਟਰੀ ਪੱਧਰ"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"ਭਾਈਚਾਰਕ"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"ਭਾਈਚਾਰਕ ਸੈਟਿੰਗਾਂ"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ਪਹੁੰਚ ਬਿੰਦੂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45a881e..dcb24e1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Odcisk palca + kod PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Odcisk palca + hasło"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Kontynuuj bez odcisku palca"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Możesz odblokować telefon odciskiem palca. Ze względów bezpieczeństwa opcja wymaga dodatkowej blokady ekranu."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Możesz odblokować telefon odciskiem palca. Ze względów bezpieczeństwa opcja wymaga dodatkowej blokady ekranu."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Rozpoznawanie twarzy + wzór"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Rozpoznawanie twarzy + kod PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Rozpoznawanie twarzy + hasło"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Kontynuuj bez rozpoznawania twarzy"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Możesz odblokować telefon za pomocą skanu twarzy. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Możesz odblokować telefon za pomocą skanu twarzy. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Wzór • Twarz • Odcisk palca"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Kod PIN • Twarz • Odcisk palca"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Hasło • Twarz • Odcisk palca"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Kontynuuj bez rozpoznawania twarzy lub odcisku palca"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Możesz odblokowywać telefon, korzystając z rozpoznawania twarzy lub odcisku palca. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Możesz odblokowywać telefon, korzystając z rozpoznawania twarzy lub odcisku palca. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Przesuń palcem"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Możesz zacząć używać nośnika <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stan baterii"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Poziom naładowania baterii"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Wspólne"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Wspólne ustawienia"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nazwy APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Edytuj punkt dostępu"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nie ustawiono"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ac46a06..d81167a 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Impressão digital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Impressão digital + senha"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sem impressão digital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"É possível desbloquear seu smartphone usando sua impressão digital. Por razões de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"É possível desbloquear seu smartphone usando sua impressão digital. Por razões de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueio facial + padrão"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueio facial + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuar sem o Desbloqueio facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Padrão • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Senha • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sem rosto ou impressão digital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Desbloqueie o smartphone usando seu rosto ou sua impressão digital. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Desbloqueie o smartphone usando seu rosto ou sua impressão digital. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Você já pode usar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status da bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nível da bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Compartilhadas"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configurações compartilhadas"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar ponto de acesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sem definição"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5eafbdc..e551d4a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Impressão digital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Impressão digital + palavra-passe"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sem impressão digital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Pode desbloquear o seu telemóvel através da sua impressão digital. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Pode desbloquear o seu telemóvel através da sua impressão digital. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueio facial + padrão"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueio facial + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueio facial + palavra-passe"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continue sem o Desbloqueio facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Pode desbloquear o telemóvel através do seu rosto. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Pode desbloquear o telemóvel através do seu rosto. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Padrão • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Palavra-passe • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sem rosto ou impressão digital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Pode desbloquear o telemóvel com o seu rosto ou impressão digital. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Pode desbloquear o telemóvel com o seu rosto ou impressão digital. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo gestor, política de encriptação ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar rapidamente"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ac46a06..d81167a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Impressão digital + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Impressão digital + senha"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sem impressão digital"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"É possível desbloquear seu smartphone usando sua impressão digital. Por razões de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"É possível desbloquear seu smartphone usando sua impressão digital. Por razões de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Desbloqueio facial + padrão"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Desbloqueio facial + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuar sem o Desbloqueio facial"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Padrão • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Senha • Rosto • Impressão digital"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuar sem rosto ou impressão digital"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Desbloqueie o smartphone usando seu rosto ou sua impressão digital. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Desbloqueie o smartphone usando seu rosto ou sua impressão digital. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Você já pode usar o <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status da bateria"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nível da bateria"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Compartilhadas"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Configurações compartilhadas"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Editar ponto de acesso"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Sem definição"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 789786f..0588821 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Amprentă + cod PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Amprentă + parolă"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuă fără amprentă"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Poți debloca telefonul folosind amprenta. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Poți debloca telefonul folosind amprenta. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Deblocare facială + model"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Deblocare facială + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Deblocare facială + parolă"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Continuă fără Deblocarea facială"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Poți debloca telefonul folosind chipul. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Poți debloca telefonul folosind chipul. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Model • Față • Amprentă"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Față • Amprentă"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Parolă • Față • Amprentă"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Continuă fără față sau amprentă"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Poți debloca telefonul folosind fața sau amprenta. Pentru securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Poți debloca telefonul folosind fața sau amprenta. Pentru securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dezactivat de administrator, politica de criptare sau spațiul de stocare a certificatelor"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Glisare"</string>
@@ -1806,10 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Poți începe să folosești <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stare baterie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nivelul bateriei"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Comune"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Setări comune"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Nume APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Modifică punctul de acces"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nesetat(ă)"</string>
@@ -3174,11 +3184,11 @@
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extinde autonomia bateriei și îmbunătățește performanța dispozitivului, gestionând automat conexiunile la rețea"</string>
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Activată"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Dezactivată"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"Stocarea certificatelor"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"Stocarea datelor de conectare"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalează un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalează certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Instalează certificate de pe cardul SD"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"Șterge acreditările"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"Șterge datele de conectare"</string>
     <string name="credentials_reset_summary" msgid="5400585520572874255">"Elimină toate certificatele"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Date de conectare de încredere"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Afișează certificatele CA de încredere"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7660076..d2d8d57 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Отпечатки пальцев и PIN-код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Отпечатки пальцев и пароль"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Продолжить без настройки отпечатка"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Вы можете настроить разблокировку телефона с помощью отпечатка пальца. В целях безопасности вам нужно будет также установить дополнительный способ разблокировки."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Вы можете настроить разблокировку телефона с помощью отпечатка пальца. В целях безопасности вам нужно будет также установить дополнительный способ разблокировки."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Фейсконтроль + графический ключ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Фейсконтроль + PIN-код"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Продолжить без фейсконтроля"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Вы можете настроить разблокировку телефона с помощью распознавания лица. В целях безопасности вам нужно будет также установить дополнительный способ блокировки."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Вы можете настроить разблокировку телефона с помощью распознавания лица. В целях безопасности вам нужно будет также установить дополнительный способ блокировки."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Графический ключ • Фейсконтроль • Отпечаток"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-код • Фейсконтроль • Отпечаток пальца"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Пароль • Фейсконтроль • Отпечаток пальца"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Продолжить без фейсконтроля или отпечатка пальца"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Вы можете разблокировать телефон с помощью фейсконтроля или отпечатка пальца. В целях безопасности вам потребуется установить запасной способ разблокировки."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Вы можете разблокировать телефон с помощью фейсконтроля или отпечатка пальца. В целях безопасности вам потребуется установить запасной способ разблокировки."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Запрещено администратором или иными правилами"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Провести по экрану"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Теперь вы можете использовать устройство \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Уровень заряда батареи"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Совместные"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Совместные настройки"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Точки доступа"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Изменить точку доступа"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не задано"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index fc59abb..910a8ef 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ඇඟිලි සලකුණ + PIN අංකය"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ඇඟිලි සලකුණ + මුරපදය"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ඇඟිලි සලකුණ නොමැතිව දිගටම කර ගෙන යන්න"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"ඔබට ඔබගේ ඇඟිලි සලකුණ භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"ඔබට ඔබගේ ඇඟිලි සලකුණ භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"මුහුණෙන් අගුළු හැරීම + රටාව"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"මුහුණෙන් අගුළු හැරීම + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"මුහුණෙන් අගුළු හැරීම + මුරපදය"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"මුහුණෙන් අගුළු හැරීම නොමැතිව ඉදිරියට යන්න"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"ඔබට ඔබගේ මුහුණ භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"ඔබට ඔබගේ මුහුණ භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"රටාව • මුහුණ • ඇඟිලි සලකුණ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • මුහුණ • ඇඟිලි සලකුණ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"මුරපදය • මුහුණ • ඇඟිලි සලකුණ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"මුහුණ හෝ ඇඟිලි සලකුණ නොමැතිව ඉදිරියට යන්න"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"ඔබට ඔබගේ දුරකථනය ඔබගේ මුහුණ හෝ ඇඟිලි සලකුණ භාවිතයෙන් අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යයි."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"ඔබට ඔබගේ දුරකථනය ඔබගේ මුහුණ හෝ ඇඟිලි සලකුණ භාවිතයෙන් අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යයි."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"පරිපාලකයා, සංකේතන ප්‍රතිපත්තිය, හෝ අක්තපත්‍ර ආචයනය මඟින් අබල කර ඇත"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"කිසිවක් නැත"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ස්වයිප් කරන්න"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"ඔබට ඔබේ <xliff:g id="NAME">^1</xliff:g> භාවිතය ආරම්භ කළ හැක"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"බැටරි මට්ටම"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"වාර්ගික"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"වාර්ගික සැකසීම්"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ප්‍රවේශ ස්ථානය සංස්කරණය"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"පිහිටුවා නැත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 31fd294..fc95407 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Odtlačok prsta + kód PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Odtlačok prsta + heslo"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Pokračovať bez odtlačku prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefón môžete odomknúť odtlačkom prsta. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefón môžete odomknúť odtlačkom prsta. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Odomknutie tvárou a vzor"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Odomknutie tvárou a PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Odomknutie tvárou a heslo"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Pokračovať bez odomknutia tvárou"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefón môžete odomknúť pomocou tváre. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefón môžete odomknúť pomocou tváre. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Vzor • Tvár • Odtlačok prsta"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Tvár • Odtlačok prsta"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Heslo • Tvár • Odtlačok prsta"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Pokračovanie bez tváre alebo odtlačku prsta"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefón môžete odomknúť tvárou alebo odtlačkom prsta. Táto možnosť vyžaduje z bezpečnostných dôvodov zálohu zámky obrazovky."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefón môžete odomknúť tvárou alebo odtlačkom prsta. Táto možnosť vyžaduje z bezpečnostných dôvodov zálohu zámky obrazovky."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Žiadna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Potiahnutie"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> môžete začať používať"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stav batérie"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Nabitie batérie"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Spoločné"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Spoločné nastavenia"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Prístupové body"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Upraviť prístupový bod"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nenastavené"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 42fe2ec..5144fc5 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -688,7 +688,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Da, odstrani"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Šifriranje"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Šifriraj tablični računalnik"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriraj telefon"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Šifriranje telefona"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Nastavitev zaklepanja zaslona"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Za večjo varnost nastavite kodo PIN, vzorec ali geslo za to napravo."</string>
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Prstni odtis in PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Prstni odtis in geslo"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Nadaljevanje brez prstnega odtisa"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefon lahko odklenete s prstnim odtisom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega zaklepanja telefona."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefon lahko odklenete s prstnim odtisom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega zaklepanja telefona."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Odklepanje z obrazom + vzorec"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Odklepanje z obrazom + koda PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Odklepanje z obrazom + geslo"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Nadaljevanje brez odklepanja z obrazom"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefon lahko odklenete z obrazom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefon lahko odklenete z obrazom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Vzorec • Obraz • Prstni odtis"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Koda PIN • Obraz • Prstni odtis"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Geslo • Obraz • Prstni odtis"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Nadaljujte brez obraza ali prstnega odtisa"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefon lahko odklenete z obrazom ali prstnim odtisom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefon lahko odklenete z obrazom ali prstnim odtisom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogočil skrbnik, pravilnik za šifriranje ali shramba poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vlečenje"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Shrambo <xliff:g id="NAME">^1</xliff:g> lahko začnete uporabljati"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Raven napolnjenosti baterije"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Skupno"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Skupne nastavitve"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-ji"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Urejanje dostopne točke"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ni nastavljeno"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 489e923..a62aa00 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Gjurma e gishtit + Kodi PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Gjurma e gishtit + Fjalëkalimi"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Vazhdo pa gjurmën e gishtit"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Mund ta shkyçësh telefonin duke përdorur gjurmën e gishtit. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Mund ta shkyçësh telefonin duke përdorur gjurmën e gishtit. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Shkyçja me fytyrë + Motivi"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Shkyçja me fytyrë + Kodi PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Shkyçja me fytyrë + Fjalëkalimi"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Vazhdo pa \"Shkyçjen me fytyrë\""</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Mund ta shkyçësh telefonin duke përdorur fytyrën. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Mund ta shkyçësh telefonin duke përdorur fytyrën. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Motivi • Fytyra • Gjurma e gishtit"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Fytyra • Gjurma e gishtit"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Fjalëkalimet • Fytyra • Gjurma e gishtit"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Vazhdo pa fytyrë apo gjurmë gishti"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Mund ta shkyçësh telefonin duke përdorur fytyrën ose gjurmën e gishtit. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Mund ta shkyçësh telefonin duke përdorur fytyrën ose gjurmën e gishtit. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Çaktivizuar nga administratori, politika e enkriptimit ose hapësira ruajtëse e kredencialeve"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Asnjë"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Me rrëshqitje"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Mund të fillosh të përdorësh <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Statusi i baterisë"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Niveli i baterisë"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Të përbashkëta"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Cilësimet e përbashkëta"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN-të"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redakto pikën e qasjes"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Nuk është caktuar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3e67f5c..7b8e6a5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -684,7 +684,7 @@
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Да, уклони"</string>
     <string name="encryption_settings_title" msgid="2848716008695618360">"Шифровање"</string>
     <string name="encrypt_title" product="tablet" msgid="6518642273119816435">"Шифруј таблет"</string>
-    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифруј телефон"</string>
+    <string name="encrypt_title" product="default" msgid="7337365190988321100">"Шифровање телефона"</string>
     <string name="encrypted_summary" msgid="545623487587251207">"Шифровано"</string>
     <string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Подесите закључавање екрана"</string>
     <string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Да бисте побољшали безбедност, подесите PIN, шаблон или лозинку за овај уређај"</string>
@@ -738,17 +738,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"отисак прста + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"отисак прста + лозинка"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Наставите без отиска прста"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Можете да откључате телефон помоћу отиска прста. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Можете да откључате телефон помоћу отиска прста. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Откључавање лицем и шаблон"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Откључавање лицем и PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Откључавање лицем и лозинка"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Наставите без откључавања лицем"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Можете да откључате телефон помоћу лица. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Можете да откључате телефон помоћу лица. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Шаблон • Лице • Отисак прста"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Лице • Отисак прста"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Лозинка • Лице • Отисак прста"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Наставите без лица или отиска прста"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Можете да откључате телефон помоћу лица или отиска прста. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Можете да откључате телефон помоћу лица или отиска прста. Ова опција захтева резервни начин за откључавање екрана из безбедносних разлога."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Онемогућио администратор, смернице за шифровање или складиште акредитива"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Превуците"</string>
@@ -1806,10 +1818,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Можете да почнете да користите: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Статус батерије"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Ниво батерије"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Заједничко"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Заједничка подешавања"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Називи приступних тачака"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Измена приступне тачке"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Није подешено"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7cdb118..64ea4dd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingeravtryck + pinkod"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingeravtryck + lösenord"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Fortsätt utan fingeravtryck"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Du kan låsa upp mobilen med hjälp av ditt fingeravtryck. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Du kan låsa upp mobilen med hjälp av ditt fingeravtryck. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ansiktslås + mönster"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ansiktslås + pinkod"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ansiktslås + lösenord"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Fortsätt utan ansiktslås"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låsa upp mobilen med hjälp av ditt ansikte. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Du kan låsa upp mobilen med hjälp av ditt ansikte. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mönster • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Pinkod • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Lösenord • Ansikte • Fingeravtryck"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Fortsätt utan ansikte eller fingeravtryck"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Du kan låsa upp telefonen med ditt ansikte eller fingeravtryck. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Du kan låsa upp telefonen med ditt ansikte eller fingeravtryck. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Svep"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Du kan börja använda <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batteristatus"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batterinivå"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Allmänt"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Allmänna inställningar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN:er"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Redigera åtkomstpunkt"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ej fastställt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8208e3f..41b97d3 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Alama ya kidole + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Alama ya kidole + Nenosiri"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Endelea bila kutumia alama ya kidole"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Unaweza kufungua simu yako kwa kutumia alama ya kidole chako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Unaweza kufungua simu yako kwa kutumia alama ya kidole chako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Kufungua kwa uso + Mchoro"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Kufungua kwa uso + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Kufungua kwa uso + Nenosiri"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Endelea bila kipengele cha Kufungua kwa uso"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Unaweza kufungua simu yako kwa kutumia uso wako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Unaweza kufungua simu yako kwa kutumia uso wako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Mchoro • Uso • Alama ya kidole"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Uso • Alama ya kidole"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Nenosiri • Uso • Alama ya kidole"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Endelea bila kufungua kwa uso wala alama ya kidole"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Unaweza kufungua simu yako kwa kutumia uso au alama ya kidole chako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Unaweza kufungua simu yako kwa kutumia uso au alama ya kidole chako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Imezimwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya hati"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Telezesha kidole"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Unaweza kuanza kutumia <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Hali ya betri"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Kiwango cha betri"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ya jumuiya"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Mipangilio ya jumuiya"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Badilisha mahali pa kufikia"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Haijawekwa"</string>
@@ -5496,8 +5506,7 @@
     <string name="mobile_data_usage_title" msgid="2047864499317759728">"Programu zinavyotumia data"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"Hali ya Mtandao Isiyo sahihi <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Puuza"</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"Majina ya Milango ya Mtandao"</string>
-    <!-- no translation found for keywords_access_point_names (8174967126858505945) -->
-    <skip />
+    <string name="keywords_access_point_names" msgid="8174967126858505945">"apn"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Angalia zaidi"</string>
     <string name="see_less" msgid="2642392725363552793">"Angalia chache"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 97027a1..b5a3b0c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"கைரேகை + பின்"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"கைரேகை + கடவுச்சொல்"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"கைரேகையின்றி தொடர்க"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"கைரேகையைப் பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். பாதுகாப்பிற்காக, இந்த விருப்பத்திற்கு மாற்று திரைப் பூட்டு அவசியம்."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"கைரேகையைப் பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். பாதுகாப்பிற்காக, இந்த விருப்பத்திற்கு மாற்று திரைப் பூட்டு அவசியம்."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"முகம் காட்டித் திறத்தல் + பேட்டர்ன்"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"முகம் காட்டித் திறத்தல் + பின்"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"முகம் காட்டித் திறத்தல் + கடவுச்சொல்"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"\'முகம் காட்டித் திறத்தல்\' அம்சத்தைப் பயன்படுத்தாமல் தொடர்க"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"முகத்தைப் பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். இந்த வசதியை உபயோகிக்கும்போது, பாதுகாப்பிற்காகத் திரைப் பூட்டையும் அமைத்திருப்பது அவசியம்."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"முகத்தைப் பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். இந்த வசதியை உபயோகிக்கும்போது, பாதுகாப்பிற்காகத் திரைப் பூட்டையும் அமைத்திருப்பது அவசியம்."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"பேட்டர்ன் • முகம் • கைரேகை"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"பின் • முகம் • கைரேகை"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"கடவுச்சொல் • முகம் • கைரேகை"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"முகம்/கைரேகையைப் பயன்படுத்தாமல் தொடர்க"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"உங்கள் முகத்தையோ கைரேகையையோ பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். பாதுகாப்பிற்காக, இதனுடன் மற்றுமொரு திரைப் பூட்டையும் பயன்படுத்தவும்."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"உங்கள் முகத்தையோ கைரேகையையோ பயன்படுத்தி மொபைலை அன்லாக் செய்யலாம். பாதுகாப்பிற்காக, இதனுடன் மற்றுமொரு திரைப் பூட்டையும் பயன்படுத்தவும்."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/அனுமதிச் சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ஸ்வைப்"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"உங்கள் <xliff:g id="NAME">^1</xliff:g> ஐப் பயன்படுத்தத் தொடங்கலாம்"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"பேட்டரி நிலை"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"சமூகம்"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"சமூக அமைப்புகள்"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN பட்டியல்"</string>
     <string name="apn_edit" msgid="2003683641840248741">"ஆக்சஸ் பாயிண்ட்டைத் திருத்து"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"அமைக்கப்படவில்லை"</string>
@@ -3141,7 +3151,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவலாம்"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD கார்டிலிருந்து சான்றிதழ்களை நிறுவு"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"அனுமதிச் சான்றுகளை அழி"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"எல்லா சான்றிதழ்களையும் அகற்று"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"எல்லா சான்றிதழ்களையும் அகற்றும்"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"நம்பிக்கைச் சான்றுகள்"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"நம்பகமான CA சான்றிதழ்களைக் காட்டும்"</string>
     <string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 55eb09e..783d945 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"వేలిముద్ర + పిన్"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"వేలిముద్ర + పాస్‌వర్డ్"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"వేలిముద్ర లేకుండా కొనసాగండి"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"మీరు మీ వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"మీరు మీ వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"ఫేస్ అన్‌లాక్ + ఆకృతి"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"ఫేస్ అన్‌లాక్ + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"ఫేస్ అన్‌లాక్ + పాస్‌వర్డ్"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ఫేస్ అన్‌లాక్ లేకుండానే కొనసాగించండి"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"ఆకృతి • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"పాస్‌వర్డ్ • ముఖం • వేలిముద్ర"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ఫేస్ లేదా వేలిముద్ర లేకుండా కొనసాగించండి"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"మీరు మీ ముఖాన్ని లేదా వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"మీరు మీ ముఖాన్ని లేదా వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. సెక్యూరిటీ కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"స్వైప్"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8cfd8a3..247dce4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"ลายนิ้วมือ + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"ลายนิ้วมือ + รหัสผ่าน"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"ดำเนินการต่อโดยไม่ใช้ลายนิ้วมือ"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"คุณสามารถปลดล็อกโทรศัพท์โดยใช้ลายนิ้วมือ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"คุณสามารถปลดล็อกโทรศัพท์โดยใช้ลายนิ้วมือ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"การปลดล็อกด้วยใบหน้าและรูปแบบ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"การปลดล็อกด้วยใบหน้าและ PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"การปลดล็อกด้วยใบหน้าและรหัสผ่าน"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"ดำเนินการต่อโดยไม่ใช้การปลดล็อกด้วยใบหน้า"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"รูปแบบ • ใบหน้า • ลายนิ้วมือ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • ใบหน้า • ลายนิ้วมือ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"รหัสผ่าน • ใบหน้า • ลายนิ้วมือ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"ดำเนินการต่อโดยไม่ตั้งค่าการปลดล็อกด้วยใบหน้าหรือลายนิ้วมือ"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าหรือลายนิ้วมือได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าหรือลายนิ้วมือได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ปิดใช้โดยผู้ดูแลระบบ นโยบายการเข้ารหัสลับ หรือที่เก็บข้อมูลเข้าสู่ระบบ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ปัด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a3b983d..7ac2f80 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Fingerprint + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Fingerprint + Password"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Magpatuloy nang walang fingerprint"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Maa-unlock mo ang telepono mo gamit ang iyong fingerprint. Para sa seguridad, nangangailagan ang opsyong ito ng backup na lock ng screen."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Maa-unlock mo ang telepono mo gamit ang iyong fingerprint. Para sa seguridad, nangangailagan ang opsyong ito ng backup na lock ng screen."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Pag-unlock Gamit ang Mukha + Pattern"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Pag-unlock Gamit ang Mukha + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Pag-unlock Gamit ang Mukha + Password"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Magpatuloy nang walang Pag-unlock Gamit ang Mukha"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Maa-unlock mo ang iyong telepono gamit ang mukha mo. Para sa seguridad, nangangailangan ang opsyong ito ng backup na lock ng screen."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Maa-unlock mo ang iyong telepono gamit ang mukha mo. Para sa seguridad, nangangailangan ang opsyong ito ng backup na lock ng screen."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Pattern • Mukha • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Mukha • Fingerprint"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Password • Mukha • Fingerprint"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Magpatuloy nang walang mukha o fingerprint"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Maa-unlock mo ang iyong telepono gamit ang mukha o fingerprint mo. Para sa seguridad, kinakailangan ng opsyong ito ng backup na lock ng screen."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Maa-unlock mo ang iyong telepono gamit ang mukha o fingerprint mo. Para sa seguridad, kinakailangan ng opsyong ito ng backup na lock ng screen."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Na-disable ng admin, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Mag-swipe"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Magagamit mo na ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Status ng baterya"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Antas ng baterya"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Communal"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Mga communal setting"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Mga APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"I-edit ang access point"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Hindi nakatakda"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f780cd0..a249bb7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Parmak İzi + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Parmak İzi + Şifre"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Parmak izi olmadan devam et"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefonunuzun kilidini parmak izinizle açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefonunuzun kilidini parmak izinizle açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Yüz Tanıma Kilidi + Desen"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Yüz Tanıma Kilidi + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Yüz Tanıma Kilidi + Şifre"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Yüz Tanıma Kilidi olmadan devam et"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefonunuzun kilidini yüzünüzü kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefonunuzun kilidini yüzünüzü kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Desen • Yüz • Parmak İzi"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • Yüz • Parmak İzi"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Şifre • Yüz • Parmak İzi"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Yüz tanıma veya parmak izi kilidi kurmadan devam et"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefonunuzun kilidini, yüzünüzü veya parmak izinizi kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefonunuzun kilidini, yüzünüzü veya parmak izinizi kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Yönetici, şifreleme politikası veya kimlik bilgileri deposu tarafından devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Yok"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hızlıca kaydırma"</string>
@@ -1039,7 +1051,7 @@
     <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"Herkese açık yüksek kaliteli ağlara otomatik olarak bağlan"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"Bu özelliği kullanmak için ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"Bu özelliği kullanmak için uygun bir ağ derecelendirme sağlayıcısı seçin"</string>
-    <string name="wifi_install_credentials" msgid="5192903644606839972">"Sertifika yükle"</string>
+    <string name="wifi_install_credentials" msgid="5192903644606839972">"Sertifika yükleme"</string>
     <string name="wifi_scan_notify_text" msgid="7163137260385995873">"Uygulamalar ve hizmetler, konum doğruluğunu iyileştirmek için kablosuz ağları kablosuz özelliği kapalıyken bile her zaman tarayabilir. Bu özellik örneğin konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir. Bunu <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Kablosuz ağ taraması ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> değiştirebilirsiniz."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Konum doğruluğunu iyileştirmek için <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kablosuz ağ taraması ayarlarında<xliff:g id="LINK_END_1">LINK_END</xliff:g> kablosuz ağ taramasını açın."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"Bir daha gösterme"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> biriminizi kullanmaya başlayabilirsiniz"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Pil durumu"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Pil düzeyi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Ortak"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Ortak ayarlar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN\'ler"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Erişim noktasını düzenle"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Ayarlanmadı"</string>
@@ -3137,11 +3147,11 @@
     <string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Açık"</string>
     <string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Kapalı"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kimlik bilgileri deposu"</string>
-    <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükle"</string>
+    <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükleme"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaları depolama biriminden yükleyin"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Sertifikaları SD karttan yükle"</string>
-    <string name="credentials_reset" msgid="4246628389366452655">"Kimlik bilgilerini temizle"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"Tüm sertifikaları kaldır"</string>
+    <string name="credentials_reset" msgid="4246628389366452655">"Kimlik bilgilerini temizleme"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"Tüm sertifikaları kaldırın"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"Güvenilen kimlik bilgileri"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"Güvenilen CA sertifikalarını görüntüleyin"</string>
     <string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 81f1845..8f3d542 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -742,17 +742,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Відбиток пальця + PIN-код"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Відбиток пальця + пароль"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Продовжити без відбитка пальця"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Ви можете розблоковувати свій телефон відбитком пальця. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Ви можете розблоковувати свій телефон відбитком пальця. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Фейсконтроль + ключ"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Фейсконтроль + PIN-код"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Продовжити без фейсконтролю"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Ви можете розблоковувати свій телефон за допомогою розпізнавання облич. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Ви можете розблоковувати свій телефон за допомогою розпізнавання облич. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Ключ • Фейсконтроль • Відбиток пальця"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN-код • Фейсконтроль • Відбиток пальця"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Пароль • Фейсконтроль • Відбиток пальця"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Продовжити без фейсконтролю чи відбитка пальця"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Телефон можна розблокувати за допомогою фейсконтролю чи відбитка пальця. З міркувань безпеки для цих функцій потрібно налаштувати резервний спосіб розблокування."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Телефон можна розблокувати за допомогою фейсконтролю чи відбитка пальця. З міркувань безпеки для цих функцій потрібно налаштувати резервний спосіб розблокування."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Провести по екрану"</string>
@@ -1827,10 +1839,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g>: готово до використання"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Стан акумулятора"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Рівень заряду акумулятора"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Для спільного використання"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Налаштування для спільного використання"</string>
     <string name="apn_settings" msgid="4295467389400441299">"Точки доступу"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Змінити точку доступу"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Не встановлено"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3c9baf2..f3a339f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"‏فنگر پرنٹ + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"فنگر پرنٹ + پاس ورڈ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"فنگر پرنٹ کے بغیر جاری رکھیں"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"آپ اپنے فون کو اپنا فنگر پرنٹ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین قفل درکار ہے۔"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"آپ اپنے فون کو اپنا فنگر پرنٹ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین قفل درکار ہے۔"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"فیس اَنلاک + پیٹرن"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"‏فیس اَنلاک + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"فیس اَنلاک + پاس ورڈ"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"فیس اَنلاک کے بغیر جاری رکھیں"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"آپ اپنے فون کو اپنا چہرہ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"آپ اپنے فون کو اپنا چہرہ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"پیٹرن • چہرہ • فنگر پرنٹ"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"‏PIN • چہرہ • فنگر پرنٹ"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"پاس ورڈ • چہرہ • فنگر پرنٹ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"چہرے یا فنگر پرنٹ کے بغیر جاری رکھیں"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"آپ اپنے چہرے یا فنگر پرنٹ کا استعمال کر کے اپنے فون کو غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"آپ اپنے چہرے یا فنگر پرنٹ کا استعمال کر کے اپنے فون کو غیر مقفل کر سکتے ہیں۔ سیکیورٹی کیلئے، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"منتظم، مرموز کاری کی پالیسی یا اسناد اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"سوائپ"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"آپ اپنے <xliff:g id="NAME">^1</xliff:g> کا استعمال شروع کر سکتے ہیں"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"بیٹری کا اسٹیٹس"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"بیٹری کی سطح"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"کمیونل"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"کمیونل ترتیبات"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"رسائی کے مقام میں ترمیم کریں"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"سیٹ نہيں ہے"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 8e5e802..7ee95b8 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Barmoq izi + PIN kod"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Barmoq izi + parol"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Barmoq izisiz davom ettirish"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Telefonni barmoq izi orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Telefonni barmoq izi orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Yuz bilan ochish + grafik kalit"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Yuz bilan ochish + PIN kod"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Yuz bilan ochish + parol"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Yuz bilan ochish funksiyasisiz davom etish"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Telefonni yuz orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Telefonni yuz orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Grafik kalit • Yuz • Barmoq izi"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN kod • Yuz • Barmoq izi"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Parol • Yuz • Barmoq izi"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Yuz yoki barmoq izisiz davom etish"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Telefon qulfini yuz yoki barmoq izi bilan ochishingiz mumkin. Xavfsizlik maqsadida bu parametr zaxiraviy ekran qulfi bilan ishlaydi."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Telefon qulfini yuz yoki barmoq izi bilan ochishingiz mumkin. Xavfsizlik maqsadida bu parametr zaxiraviy ekran qulfi bilan ishlaydi."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administrator, shifrlash siyosati, yoki hisob ma’lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Hech qanday"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Ekranni surish"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"<xliff:g id="NAME">^1</xliff:g> omboringizdan foydalanishni boshlang"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Batareya holati"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Batareya quvvati darajasi"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Umumiy"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Umumiy sozlamalar"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Ulanish nuqtasini tahrirlash"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Kiritilmagan"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1567e97..84194b0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -342,7 +342,7 @@
     <string name="security_passwords_title" msgid="4154420930973818581">"Quyền riêng tư"</string>
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Không có sẵn"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Trạng thái bảo mật"</string>
-    <string name="security_dashboard_summary" msgid="7571035662779425918">"Phương thức khóa màn hình, Tìm thiết bị, bảo mật ứng dụng"</string>
+    <string name="security_dashboard_summary" msgid="7571035662779425918">"Phương thức khóa màn hình, Tìm thiết bị của tôi, bảo mật ứng dụng"</string>
     <string name="safety_center_title" msgid="7732397372178774777">"Bảo mật và quyền riêng tư"</string>
     <string name="safety_center_summary" msgid="3554867379951053869">"Bảo mật ứng dụng, khoá thiết bị, quyền"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Đã thêm khuôn mặt"</string>
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Vân tay + Mã PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Vân tay + Mật khẩu"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Tiếp tục mà không thiết lập vân tay"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Bạn có thể mở khóa điện thoại bằng vân tay của mình. Để đảm bảo an toàn, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Bạn có thể mở khóa điện thoại bằng vân tay của mình. Để đảm bảo an toàn, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Mở khóa bằng khuôn mặt + Hình mở khóa"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Mở khóa bằng khuôn mặt + Mã PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Mở khóa bằng khuôn mặt + Mật khẩu"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Tiếp tục mà không thiết lập tính năng Mở khóa bằng khuôn mặt"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Bạn có thể mở khóa điện thoại bằng khuôn mặt của mình. Để bảo mật, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Bạn có thể mở khóa điện thoại bằng khuôn mặt của mình. Để bảo mật, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Hình mở khóa • Khuôn mặt • Vân tay"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Mã PIN • Khuôn mặt • Vân tay"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Mật khẩu • Khuôn mặt • Vân tay"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Tiếp tục mà không thiết lập khuôn mặt hoặc vân tay"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Bạn có thể mở khóa điện thoại của mình bằng khuôn mặt hoặc vân tay. Để bảo mật, tùy chọn này yêu cầu bạn phải có một phương thức khóa màn hình dự phòng."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Bạn có thể mở khóa điện thoại của mình bằng khuôn mặt hoặc vân tay. Để bảo mật, tùy chọn này yêu cầu bạn phải có một phương thức khóa màn hình dự phòng."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Do quản trị viên tắt, c.sách mã hóa hay vùng l.trữ t.tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vuốt"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Bạn có thể bắt đầu sử dụng <xliff:g id="NAME">^1</xliff:g> của mình"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Mức pin"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Dùng chung"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Các chế độ cài đặt dùng chung"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Chỉnh sửa điểm truy cập"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"Chưa đặt"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 7b68493..e00210d 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -105,7 +105,7 @@
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
   <string-array name="eap_ocsp_type">
-    <item msgid="8568170800958331461">"不要验证"</item>
+    <item msgid="8568170800958331461">"不验证"</item>
     <item msgid="5703177653586269306">"要求证书状态（非强制）"</item>
     <item msgid="326388247868439528">"需要证书状态"</item>
   </string-array>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d23120..1740c07 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"指纹 + PIN 码"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"指纹 + 密码"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"不设置指纹并继续"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"您可以使用自己的指纹将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"您可以使用自己的指纹将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"人脸解锁 + 解锁图案"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"人脸解锁 + PIN 码"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"人脸解锁 + 密码"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"不设置人脸解锁并继续"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用自己的面孔将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"您可以使用自己的面孔将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"图案 • 人脸 • 指纹"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN 码 • 人脸 • 指纹"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"密码 • 人脸 • 指纹"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"继续，不设置人脸解锁或指纹解锁"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"您可以通过人脸或指纹解锁手机。为安全起见，您必须设置备用屏幕锁定方式，才能使用该选项。"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"您可以通过人脸或指纹解锁手机。为安全起见，您必须设置备用屏幕锁定方式，才能使用该选项。"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑动"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"您可以开始使用<xliff:g id="NAME">^1</xliff:g>了"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"电池状态"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"电池电量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共用"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共用设置"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"修改接入点"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未设置"</string>
@@ -3141,7 +3151,7 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"从存储设备安装证书"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"从SD卡安装证书"</string>
     <string name="credentials_reset" msgid="4246628389366452655">"清除凭据"</string>
-    <string name="credentials_reset_summary" msgid="5400585520572874255">"删除所有证书"</string>
+    <string name="credentials_reset_summary" msgid="5400585520572874255">"移除所有证书"</string>
     <string name="trusted_credentials" msgid="2522784976058244683">"信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="345822338358409468">"显示信任的 CA 证书"</string>
     <string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e296042..528a34f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"指紋 + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"指紋 + 密碼"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"不設定指紋並繼續"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"您可以使用指紋解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"您可以使用指紋解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"面孔解鎖 + 圖案"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"面孔解鎖 + PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"面孔解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"繼續但不設定「面孔解鎖」"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用面孔解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"您可以使用面孔解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"圖案 • 面孔 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN • 面孔 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"密碼 • 面孔 • 指紋"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"繼續但不設定面孔或指紋解鎖"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"您可以使用面孔或指紋解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"您可以使用面孔或指紋解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -1786,10 +1798,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"您可以開始使用 <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"電池狀態"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"電量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共用"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共用設定"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"編輯接入點"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未設定"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b90694e..0d7f12f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"指紋 + PIN 碼"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"指紋 + 密碼"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"不使用指紋並繼續"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"你可以使用自己的指紋將手機解鎖。為了安全起見，如要使用這個選項，你必須設定備用螢幕鎖定方式。"</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"你可以使用自己的指紋將手機解鎖。為了安全起見，如要使用這個選項，你必須設定備用螢幕鎖定方式。"</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"人臉解鎖 + 解鎖圖案"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"人臉解鎖 + PIN 碼"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"人臉解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"繼續但不設定人臉解鎖功能"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"你可以使用自己的臉孔將手機解鎖。為了安全起見，必須先設定備用螢幕鎖定方式，才能使用這個選項。"</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"你可以使用自己的臉孔將手機解鎖。為了安全起見，必須先設定備用螢幕鎖定方式，才能使用這個選項。"</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"解鎖圖案 • 人臉 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"PIN 碼 • 人臉 • 指紋"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"密碼 • 人臉 • 指紋"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"繼續但不設定人臉或指紋解鎖"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"你可以使用自己的臉或指紋將手機解鎖。為了安全起見，你必須設定備用的螢幕鎖定方式，才能使用這個選項。"</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"你可以使用自己的臉或指紋將手機解鎖。為了安全起見，你必須設定備用的螢幕鎖定方式，才能使用這個選項。"</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -1119,9 +1131,9 @@
     <string name="wifi_privacy_settings_ephemeral_summary" msgid="8502084692297249372">"已隨機化的 MAC"</string>
     <string name="wifi_dpp_add_device_to_network" msgid="6141246783457722976">"新增裝置"</string>
     <string name="wifi_dpp_center_qr_code" msgid="5270782275746178104">"將下面的視窗對準 QR 圖碼，即可將這個裝置新增至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
-    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"掃描 QR 圖碼"</string>
+    <string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"掃描 QR code"</string>
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將 QR 圖碼置於相機正下方即可連線到「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
-    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR 圖碼即可加入 Wi‑Fi"</string>
+    <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR code 即可加入 Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi-Fi"</string>
     <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃描這個 QR 圖碼即可加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"你可以開始使用 <xliff:g id="NAME">^1</xliff:g> 了"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"電池狀態"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"電池電量"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"共通"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"共通設定"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APN"</string>
     <string name="apn_edit" msgid="2003683641840248741">"編輯存取點"</string>
     <string name="apn_not_set" msgid="8246646433109750293">"未設定"</string>
@@ -5910,7 +5920,7 @@
     <string name="bluetooth_find_broadcast_summary" msgid="3907899428626210673">"正在收聽"</string>
     <string name="bluetooth_find_broadcast" msgid="1768337775649457586">"尋找廣播"</string>
     <string name="bluetooth_find_broadcast_button_leave" msgid="7881206581147104908">"離開廣播"</string>
-    <string name="bluetooth_find_broadcast_button_scan" msgid="3995664694641895189">"掃描 QR 圖碼"</string>
+    <string name="bluetooth_find_broadcast_button_scan" msgid="3995664694641895189">"掃描 QR code"</string>
     <string name="find_broadcast_password_dialog_title" msgid="3176988702535737484">"輸入密碼"</string>
     <string name="find_broadcast_password_dialog_connection_error" msgid="47873617983439400">"無法連線，請再試一次。"</string>
     <string name="find_broadcast_password_dialog_password_error" msgid="243855327674765">"密碼錯誤"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a935ae..8dbd732 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -734,17 +734,29 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Izigxivizo zeminwe + Iphinikhodi"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Izigxivizo zeminwe + Iphasiwedi"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Qhubeka ngaphandle kwezigxivizo zeminwe"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Ungavula ifoni yakho usebenzisa izigxivizo zeminwe. Ngokuphepha, le nketho idinga ukukhiya kwesikrini okuyisipele."</string>
+    <string name="fingerprint_unlock_title" product="default" msgid="4978686534505944042">"Ungavula ifoni yakho usebenzisa izigxivizo zeminwe. Ngokuphepha, le nketho idinga ukukhiya kwesikrini okuyisipele."</string>
+    <!-- no translation found for fingerprint_unlock_title (8674718459462612186) -->
+    <skip />
+    <!-- no translation found for fingerprint_unlock_title (3224468142599659740) -->
+    <skip />
     <string name="face_unlock_set_unlock_pattern" msgid="3117316407679805330">"Ukuvula ngobuso + Iphethini"</string>
     <string name="face_unlock_set_unlock_pin" msgid="5300188327595503657">"Ukuvula ngobuso + Iphinikhodi"</string>
     <string name="face_unlock_set_unlock_password" msgid="8395722611524617956">"Ukuvula ngobuso + Iphasiwedi"</string>
     <string name="face_unlock_skip_face" msgid="189695556498300008">"Qhubeka ngaphandle Kokuvula ngobuso"</string>
-    <string name="face_unlock_title" msgid="7344830351598247267">"Ungavula ifoni yakho usebenzisa ubuso bakho. Ngokuvikeleka, le nketho idinga isikrini sokukhiya esenziwe isipele."</string>
+    <string name="face_unlock_title" product="default" msgid="7344830351598247267">"Ungavula ifoni yakho usebenzisa ubuso bakho. Ngokuvikeleka, le nketho idinga isikrini sokukhiya esenziwe isipele."</string>
+    <!-- no translation found for face_unlock_title (5695698036499155727) -->
+    <skip />
+    <!-- no translation found for face_unlock_title (6768108756755361161) -->
+    <skip />
     <string name="biometrics_unlock_set_unlock_pattern" msgid="8084495264354847044">"Iphethini • Ubuso • Izigxivizo zeminwe"</string>
     <string name="biometrics_unlock_set_unlock_pin" msgid="5912980580857825894">"Iphinikhodi • Ubuso • Izigxivizo zeminwe"</string>
     <string name="biometrics_unlock_set_unlock_password" msgid="4612217647465743624">"Iphasiwedi • Ubuso • Izigxivizo zeminwe"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="7785643433551409223">"Qhubeka ngaphandle kokuvula ngobuso noma isigxivizo somunwe"</string>
-    <string name="biometrics_unlock_title" msgid="616524056055233041">"Awukwazi ukuvula ifoni yakho usebenzisa ubuso bakho noma isigxivizo somunwe. Ngokuphepha, le nketho idinga ukukhiya kwesikrini okuyisipele."</string>
+    <string name="biometrics_unlock_title" product="default" msgid="616524056055233041">"Awukwazi ukuvula ifoni yakho usebenzisa ubuso bakho noma isigxivizo somunwe. Ngokuphepha, le nketho idinga ukukhiya kwesikrini okuyisipele."</string>
+    <!-- no translation found for biometrics_unlock_title (5808626401936488028) -->
+    <skip />
+    <!-- no translation found for biometrics_unlock_title (4912499343509046929) -->
+    <skip />
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Kukhutshazwe umlawuli, inqubomgomo yokubethela, noma isitoreji sezitifiketi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swayipha"</string>
@@ -1785,10 +1797,8 @@
     <string name="storage_wizard_ready_v2_internal_moved_body" msgid="1163588718127651062">"Ungaqala ukusebenzisa i-<xliff:g id="NAME">^1</xliff:g> yakho"</string>
     <string name="battery_status_title" msgid="4661768220545945771">"Umumo webhethri"</string>
     <string name="battery_level_title" msgid="1371765298786083448">"Izinga lebhethri"</string>
-    <!-- no translation found for communal_settings_title (2845678473945902115) -->
-    <skip />
-    <!-- no translation found for communal_settings_summary (4923914136953940317) -->
-    <skip />
+    <string name="communal_settings_title" msgid="2845678473945902115">"Okomphakathi"</string>
+    <string name="communal_settings_summary" msgid="4923914136953940317">"Amasethingi omphakathi"</string>
     <string name="apn_settings" msgid="4295467389400441299">"APNs"</string>
     <string name="apn_edit" msgid="2003683641840248741">"Hlela indawo yokungena"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 29130eb..28b35b3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1628,7 +1628,11 @@
     <!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
     <string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
-    <string name="fingerprint_unlock_title">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <string name="fingerprint_unlock_title" product="default">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_unlock_title" product="tablet">You can unlock your tablet using your fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_unlock_title" product="device">You can unlock your device using your fingerprint. For security, this option requires a backup screen lock.</string>
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for Face Unlock [CHAR LIMIT=45]-->
     <string name="face_unlock_set_unlock_pattern">Face Unlock + Pattern</string>
@@ -1639,7 +1643,11 @@
     <!-- Title for preference that guides the user to skip Face Unlock setup [CHAR LIMIT=60]-->
     <string name="face_unlock_skip_face">Continue without Face Unlock</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
-    <string name="face_unlock_title">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
+    <string name="face_unlock_title" product="default">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
+    <string name="face_unlock_title" product="tablet">You can unlock your tablet using your face. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
+    <string name="face_unlock_title" product="device">You can unlock your device using your face. For security, this option requires a backup screen lock.</string>
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for biometrics unlock [CHAR LIMIT=45]-->
     <string name="biometrics_unlock_set_unlock_pattern">Pattern \u2022 Face \u2022 Fingerprint</string>
@@ -1650,7 +1658,11 @@
     <!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
     <string name="biometrics_unlock_skip_biometrics">Continue without face or fingerprint</string>
     <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
-    <string name="biometrics_unlock_title">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <string name="biometrics_unlock_title" product="default">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
+    <string name="biometrics_unlock_title" product="tablet">You can unlock your tablet using your face or fingerprint. For security, this option requires a backup screen lock.</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
+    <string name="biometrics_unlock_title" product="device">You can unlock your device using your face or fingerprint. For security, this option requires a backup screen lock.</string>
 
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by admin, encryption policy, or
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 778ee5c..89bda20 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -73,6 +73,7 @@
     private int mPreviousRotation = 0;
     private ScreenSizeFoldProvider mScreenSizeFoldProvider;
     private boolean mIsFolded;
+    private boolean mIsReverseDefaultRotation;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -120,6 +121,8 @@
         } else if (mCanAssumeSfps) {
             setHeaderText(R.string.security_settings_sfps_enroll_find_sensor_title);
             setDescriptionText(R.string.security_settings_sfps_enroll_find_sensor_message);
+            mIsReverseDefaultRotation = getApplicationContext().getResources().getBoolean(
+                    com.android.internal.R.bool.config_reverseDefaultRotation);
         } else {
             setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
             setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
@@ -175,11 +178,20 @@
         }
     }
 
+    private int getRotationFromDefault(int rotation) {
+        if (mIsReverseDefaultRotation) {
+            return (rotation + 1) % 4;
+        } else {
+            return rotation;
+        }
+    }
+
     private void updateSfpsFindSensorAnimationAsset() {
         mScreenSizeFoldProvider
                 .onConfigurationChange(getApplicationContext().getResources().getConfiguration());
         mIllustrationLottie = findViewById(R.id.illustration_lottie);
-        final int rotation = getApplicationContext().getDisplay().getRotation();
+        final int rotation = getRotationFromDefault(
+                getApplicationContext().getDisplay().getRotation());
 
         switch (rotation) {
             case Surface.ROTATION_90:
@@ -441,7 +453,7 @@
         mOrientationEventListener = new OrientationEventListener(this) {
             @Override
             public void onOrientationChanged(int orientation) {
-                final int currentRotation = getDisplay().getRotation();
+                final int currentRotation = getRotationFromDefault(getDisplay().getRotation());
                 if ((currentRotation + 2) % 4 == mPreviousRotation) {
                     mPreviousRotation = currentRotation;
                     recreate();
@@ -449,7 +461,7 @@
             }
         };
         mOrientationEventListener.enable();
-        mPreviousRotation = getDisplay().getRotation();
+        mPreviousRotation = getRotationFromDefault(getDisplay().getRotation());
     }
 
     private void stopListenOrientationEvent() {
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 71c532c..4e08f98 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -20,10 +20,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -39,6 +39,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,7 +49,6 @@
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 @RunWith(RobolectricTestRunner.class)
 public final class AppWithAdminGrantedPermissionsCounterTest {
@@ -129,7 +129,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());
+        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
         verifyNoMoreInteractions(mPackageManager);
     }
 
@@ -166,9 +166,9 @@
     }
 
     private void configureInstallTimePermissions() throws RemoteException {
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -178,9 +178,9 @@
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
                 .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
     }
 
@@ -189,15 +189,15 @@
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
         when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 9a4978b..a818637 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -20,10 +20,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -122,19 +122,19 @@
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
         when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
 
         // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -144,7 +144,7 @@
                 .thenReturn(PackageManager.PERMISSION_DENIED);
         when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
                 .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
 
         // app3 and app5 were installed by enterprise policy.
@@ -168,11 +168,11 @@
                 buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));
 
         // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any()))
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
                 .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
 
         // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID)))
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
                 .thenReturn(PackageManager.PERMISSION_DENIED);
 
         // app6 was not installed by enterprise policy.
@@ -202,7 +202,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).getInstallReason(any(), any());
+        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
         verifyNoMoreInteractions(mPackageManager);
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index 602d678..e2aed36 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -20,11 +20,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.argThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -170,7 +170,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID));
         verify(mPackageManager, atLeast(0))
-            .queryIntentActivitiesAsUser(any(), anyInt(), anyInt());
+            .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt());
     }
 
     public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index da5ada7..e0a0836 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 178a26f..3e46027 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.Manifest;
@@ -142,6 +142,6 @@
 
         controller.getSettingIntent(null);
 
-        verifyNoInteractions(assistUtils);
+        verifyZeroInteractions(assistUtils);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index ee6ae22..b899206 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -25,11 +25,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 81f4859..fac8b58 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -21,8 +21,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 37b8ab6..f2b0acd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -40,7 +40,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -268,7 +268,7 @@
         mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon,
                 null /* keys */, tile, "123", Preference.DEFAULT_ORDER);
 
-        verifyNoInteractions(tile);
+        verifyZeroInteractions(tile);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index e7b59a3..bccec3e 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -19,14 +19,14 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index cef5928..861b4e3 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -19,15 +19,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -132,9 +133,9 @@
                 mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning);
 
         doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt());
-        when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1);
-        when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L);
-        when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L);
+        when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1);
+        when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L);
+        when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L);
 
         billingCycleSettings.updatePrefs();
 
diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
index 4391425..70a1a38 100644
--- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index 9fb364e..b9c4edc 100644
--- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.time.Capabilities;
@@ -99,7 +99,7 @@
         mController.setChecked(true);
 
         // Verify the TimeManager was not called.
-        verifyNoInteractions(mTimeManager);
+        verifyZeroInteractions(mTimeManager);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
index 35e044c..3f49b15 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java
@@ -23,8 +23,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 06e4107..09d1c84 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -18,10 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -79,7 +79,7 @@
             }
         }).when(mFeatureFactory.applicationFeatureProvider)
                 .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions),
-                        eq(async), any());
+                        eq(async), anyObject());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index c32d2d7..f39b4b8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
@@ -74,7 +74,7 @@
                 return null;
             }
         }).when(mFeatureFactory.applicationFeatureProvider)
-                .calculateNumberOfPolicyInstalledApps(eq(async), any());
+                .calculateNumberOfPolicyInstalledApps(eq(async), anyObject());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 8c65086..90e8caf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -30,7 +30,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
@@ -859,7 +859,7 @@
         mFragment.onRadioButtonClicked(mOptimizePreference);
         mFragment.onPause();
 
-        verifyNoInteractions(mMetricsFeatureProvider);
+        verifyZeroInteractions(mMetricsFeatureProvider);
     }
 
     @Test
@@ -870,7 +870,7 @@
 
         mFragment.notifyBackupManager();
 
-        verifyNoInteractions(mBackupManager);
+        verifyZeroInteractions(mBackupManager);
     }
 
     @Test
@@ -893,6 +893,6 @@
 
         mFragment.onPause();
 
-        verifyNoInteractions(mBackupManager);
+        verifyZeroInteractions(mBackupManager);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
index 55ff93b..283df7b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
@@ -34,7 +34,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.AppOpsManager;
 import android.app.backup.BackupDataInputStream;
@@ -254,7 +254,7 @@
 
         mBatteryBackupHelper.restoreEntity(mBackupDataInputStream);
 
-        verifyNoInteractions(mBackupDataInputStream);
+        verifyZeroInteractions(mBackupDataInputStream);
     }
 
     @Test
@@ -292,13 +292,13 @@
     @Test
     public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception {
         mBatteryBackupHelper.restoreOptimizationMode(new byte[0]);
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
 
         mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes());
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
 
         mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes());
-        verifyNoInteractions(mBatteryOptimizeUtils);
+        verifyZeroInteractions(mBatteryOptimizeUtils);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 78534e1..6389dc9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
@@ -267,7 +267,7 @@
 
         mController.updateHeaderByBatteryTips(null, mBatteryInfo);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
     }
 
     @Test
@@ -277,7 +277,7 @@
 
         mController.updateHeaderByBatteryTips(lowBatteryTip, null);
 
-        verifyNoInteractions(mBatteryUsageProgressBarPref);
+        verifyZeroInteractions(mBatteryUsageProgressBarPref);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index f92c322..b223d0b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -25,16 +25,16 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.AppOpsManager;
@@ -183,8 +183,8 @@
         mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED);
         TimeUnit.SECONDS.sleep(1);
 
-        verifyNoInteractions(mMockBackend);
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBackend);
+        verifyZeroInteractions(mMockBatteryUtils);
     }
 
     @Test
@@ -247,7 +247,7 @@
                 AppOpsManager.MODE_ALLOWED, /* allowListed */ false,
                 /* isSystemOrDefaultApp */ false);
 
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBatteryUtils);
 
         final InOrder inOrder = inOrder(mMockBackend);
         inOrder.verify(mMockBackend).refreshList();
@@ -261,7 +261,7 @@
                 AppOpsManager.MODE_ALLOWED, /* allowListed */ true,
                 /* isSystemOrDefaultApp */ true);
 
-        verifyNoInteractions(mMockBatteryUtils);
+        verifyZeroInteractions(mMockBatteryUtils);
 
         final InOrder inOrder = inOrder(mMockBackend);
         inOrder.verify(mMockBackend).refreshList();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
index 5815bae..da397fd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
index 151b8ae..9fbcb16 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
@@ -18,9 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyFloat;
-import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 07a5504..683f0fd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -17,10 +17,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.spy;
 
 import android.content.ContentValues;
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 9aa79ff..bafc021 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,15 +16,16 @@
 
 package com.android.settings.network;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -161,7 +162,7 @@
 
         mController.onResume();
 
-        verifyNoInteractions(mPreference);
+        verifyZeroInteractions(mPreference);
 
         Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
 
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
index 3791c23..1660955 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -18,7 +18,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
@@ -43,10 +42,10 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.internal.util.reflection.FieldSetter;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -193,26 +192,16 @@
         rule.setEnabled(false);
         rMap.put(testId, rule);
         mockGetAutomaticZenRules(NUM_RULES, rMap);
-        setZenRulePreferenceField("mId", testId);
+        FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId);
         mController.updateState(mockPref);
         verify(mZenRulePreference, times(1)).updatePreference(any());
         verify(mockPref, never()).removeAll();
         assertEquals(NUM_RULES, mController.mZenRulePreferences.size());
     }
 
-    private void setZenRulePreferenceField(String name, Object value) {
-        try {
-            Field field = ZenRulePreference.class.getDeclaredField("mId");
-            field.setAccessible(true);
-            field.set(mZenRulePreference, value);
-        } catch (ReflectiveOperationException e) {
-            fail("Unable to set mZenRulePreference field: " + name);
-        }
-    }
-
     private void mockGetAutomaticZenRules(int numRules, Map<String, AutomaticZenRule> rules) {
         Map.Entry<String, AutomaticZenRule>[] arr = new Map.Entry[numRules];
         rules.entrySet().toArray(arr);
         when(mBackend.getAutomaticZenRules()).thenReturn(arr);
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
index d5834f9..6bf0538 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -146,4 +146,4 @@
         }
         return null;
     }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
index c431c53..99fa8e6 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java
@@ -30,8 +30,8 @@
 import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY_NONE;
 import static com.android.settings.notification.zen.ZenPrioritySendersHelper.UNKNOWN;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
index 01f3dfa..2f7dfe7 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
index b5d07cc..96036d5 100644
--- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java
@@ -21,8 +21,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -72,7 +72,7 @@
         mPreference = new Preference(mContext);
         when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager);
         when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager);
-        when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob);
+        when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob);
         when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo);
         mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -93,7 +93,7 @@
 
     @Test
     public void updateUi_visiblePreference() {
-        when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint");
+        when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint");
         mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(mPreference.isVisible()).isTrue();
@@ -103,7 +103,7 @@
 
     @Test
     public void updateUi_invisiblePreference() {
-        when(mPrintJobInfo.getStatus(any())).thenReturn(null);
+        when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null);
         mLifecycle.handleLifecycleEvent(ON_START);
 
         assertThat(mPreference.isVisible()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
index da4d58c..09c5bf3 100644
--- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java
@@ -21,8 +21,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -75,7 +75,7 @@
         mTestLabel = "PrintTest";
         when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager);
         when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager);
-        when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob);
+        when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob);
         when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo);
         mController = new PrintJobPreferenceController(mContext, PREF_KEY);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
index 2a7bd29..c646a93 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.settings.SettingsEnums;
@@ -91,7 +91,7 @@
 
         SearchMenuController.init(mHost);
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 
     @Test
@@ -100,7 +100,7 @@
         SearchMenuController.init(mHost);
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
 
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 
     @Test
@@ -112,6 +112,6 @@
 
         mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
 
-        verifyNoInteractions(mMenu);
+        verifyZeroInteractions(mMenu);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index e297b78..62c7bd8 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -111,7 +111,7 @@
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
         mAdapter.requestHighlight(mRoot, null /* recyclerView */,  mock(AppBarLayout.class));
 
-        verifyNoInteractions(mRoot);
+        verifyZeroInteractions(mRoot);
     }
 
     @Test
@@ -125,7 +125,7 @@
         when(mFragment.getArguments()).thenReturn(null);
         when(mFragment.getPreferenceScreen()).thenReturn(screen);
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
-        verifyNoInteractions(screen);
+        verifyZeroInteractions(screen);
     }
 
     @Test
@@ -150,7 +150,7 @@
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
 
         verify(mFragment).getInitialExpandedChildCount();
-        verifyNoInteractions(screen);
+        verifyZeroInteractions(screen);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index e5b13c4..e4d3982 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -195,7 +195,7 @@
     }
 
     private List<WifiEntry> createWifiEntryList() {
-        List<WifiEntry> wifiEntryList = new ArrayList<>();
+        List<WifiEntry> wifiEntryList = spy(new ArrayList<>());
 
         final WifiEntry wifiEntry1 = mock(WifiEntry.class);
         when(wifiEntry1.getSsid()).thenReturn("Test AP 1");
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
index 610e520..8478a54 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
@@ -21,9 +21,9 @@
 import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
         .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -75,7 +75,7 @@
         mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */));
         mDisclaimerItemList.add(mDisclaimerItem);
 
-        when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView);
+        when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
         when(mViewGroup.getContext()).thenReturn(mContext);
         when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn(
                 mLayoutInflater);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
index c8e4cce..985edda 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
index 148095a..3fe9678 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
index 0ece537..207a231 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
@@ -16,9 +16,10 @@
 
 package com.android.settings.wifi.calling;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
@@ -94,7 +95,7 @@
 
         doReturn(mActivity).when(mFragment).getActivity();
 
-        when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView);
+        when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView);
         when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton);
         when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton);
         when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 1faa611..e2c5ca3 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -16,17 +16,17 @@
 
 package com.android.settings.wifi.calling;
 
+import static junit.framework.Assert.assertEquals;
+
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertEquals;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -44,6 +44,7 @@
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index c86a023..274ac16 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -17,16 +17,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -94,6 +93,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.InOrder;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -1255,7 +1255,7 @@
         mMockWifiConfig.creatorUid = doUid;
         ComponentName doComponent = new ComponentName(doPackage, "some.Class");
         try {
-            when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt()))
+            when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt()))
                     .thenReturn(doUid);
         } catch (PackageManager.NameNotFoundException e) {
             //do nothing